From 0dd71e4bcd20a62d717ce03bbbe72f646bf9e07f5bf95611159368fb8c73a4ba Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 23 Nov 2023 19:47:18 +0000 Subject: [PATCH] - Delete system-libs.patch (only needed when _service makes tarballs directly from git) OBS-URL: https://build.opensuse.org/package/show/security:forensics/libewf?expand=0&rev=39 --- libewf.changes | 6 +++++ libewf.spec | 7 +---- system-libs.patch | 67 ----------------------------------------------- 3 files changed, 7 insertions(+), 73 deletions(-) delete mode 100644 system-libs.patch diff --git a/libewf.changes b/libewf.changes index 02bf2c8..bdd789c 100644 --- a/libewf.changes +++ b/libewf.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 19:46:16 UTC 2023 - Jan Engelhardt + +- Delete system-libs.patch (only needed when _service makes + tarballs directly from git) + ------------------------------------------------------------------- Sun Nov 19 10:30:24 UTC 2023 - Jan Engelhardt diff --git a/libewf.spec b/libewf.spec index a647884..3c8bc1e 100644 --- a/libewf.spec +++ b/libewf.spec @@ -33,9 +33,7 @@ Source20: http://downloads.sf.net/libewf/mount_ewf-20090113.py Source21: Expert_Witness_Compression_Format_EWF.pdf Source23: Expert_Witness_Compression_Format_2_EWF2.pdf Patch1: remove_date_time_macros.patch -Patch2: system-libs.patch BuildRequires: %{python_module devel} -BuildRequires: autoconf >= 2.71 BuildRequires: bison BuildRequires: c_compiler BuildRequires: flex @@ -71,6 +69,7 @@ BuildRequires: pkgconfig(openssl) >= 1.0.0 BuildRequires: pkgconfig(uuid) >= 2.20 BuildRequires: pkgconfig(zlib) >= 1.2.5 %python_subpackages +# Various notes: https://en.opensuse.org/libyal %description libewf is a library for support of the Expert Witness Compression @@ -125,10 +124,6 @@ applications that want to make use of %name. cp -av %_sourcedir/*.pdf . %build -#export CFLAGS="%optflags -fno-strict-aliasing" -autoreconf -fi -# OOT builds are presently broken, so we have to install -# within each python iteration now, not in %%install. %{python_expand # # see libcdata for version-sc echo "V_%version { global: *; };" >v.sym diff --git a/system-libs.patch b/system-libs.patch deleted file mode 100644 index 9dcb33f..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,67 +0,0 @@ -From: Jan Engelhardt -Date: 2021-05-12 17:36:02.536572543 +0200 - -Some dirs are not present in snapshots directly generated from git -(nor are they marked as a submodule). Patch it out, since we have -them as system libs. ---- - Makefile.am | 38 -------------------------------------- - 1 file changed, 38 deletions(-) - -Index: libewf-20230212/Makefile.am -=================================================================== ---- libewf-20230212.orig/Makefile.am -+++ libewf-20230212/Makefile.am -@@ -3,28 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libcdatetime \ -- libclocale \ -- libcnotify \ -- libcsplit \ -- libuna \ -- libcfile \ -- libcpath \ -- libbfio \ -- libfcache \ -- libfdata \ -- libfdatetime \ -- libfguid \ -- libfvalue \ -- libhmac \ -- libcaes \ - libewf \ -- libodraw \ -- libsmdev \ -- libsmraw \ - ewftools \ - ewf.net \ - pyewf \ -@@ -85,23 +64,6 @@ lib: library - - library: - (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libclocale && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcsplit && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcfile && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcpath && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libbfio && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfcache && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libhmac && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcaes && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libewf && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) -