From 014848c8da5d7b86b1c6354fca1067eeac09e41e91a13a1aea8278d144dd6736 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Nov 2022 10:34:16 +0000 Subject: [PATCH 1/2] - Delete system-libs.patch OBS-URL: https://build.opensuse.org/package/show/security:forensics/libmodi?expand=0&rev=15 --- libmodi.changes | 6 +++++ libmodi.spec | 7 +++-- system-libs.patch | 66 ----------------------------------------------- 3 files changed, 9 insertions(+), 70 deletions(-) delete mode 100644 system-libs.patch diff --git a/libmodi.changes b/libmodi.changes index b8d1419..dc13cd2 100644 --- a/libmodi.changes +++ b/libmodi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Nov 26 16:43:24 UTC 2022 - Jan Engelhardt + +- Delete system-libs.patch (not needed - system libs are + autodetected) + ------------------------------------------------------------------- Sun Oct 23 12:16:45 UTC 2022 - Jan Engelhardt diff --git a/libmodi.spec b/libmodi.spec index 6f70e25..ed4428a 100644 --- a/libmodi.spec +++ b/libmodi.spec @@ -27,7 +27,6 @@ URL: https://github.com/libyal/libmodi Source: https://github.com/libyal/libmodi/releases/download/%version/libmodi-experimental-%version.tar.gz Source2: https://github.com/libyal/libmodi/releases/download/%version/libmodi-experimental-%version.tar.gz.asc Source3: %name.keyring -Patch1: system-libs.patch BuildRequires: %{python_module devel} BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.21 @@ -56,7 +55,9 @@ BuildRequires: pkgconfig(libfvalue) >= 20220120 BuildRequires: pkgconfig(libhmac) >= 20220425 BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libuna) >= 20220611 +BuildRequires: pkgconfig(zlib) %python_subpackages +# Various notes: https://en.opensuse.org/libyal %description libmodi is a library to access the Mac OS disk image formats. @@ -105,14 +106,12 @@ read MacOS disk image formats. %build 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 %configure --disable-static --enable-wide-character-type --enable-python \ PYTHON_VERSION="%{$python_bin_suffix}" \ LDFLAGS="-Wl,--version-script=$PWD/v.sym" +grep ' '' ''local' config.log && exit 1 %make_build %make_install DESTDIR="%_builddir/rt" %make_build clean diff --git a/system-libs.patch b/system-libs.patch deleted file mode 100644 index 07c80b4..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,66 +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: libmodi-20221023/Makefile.am -=================================================================== ---- libmodi-20221023.orig/Makefile.am -+++ libmodi-20221023/Makefile.am -@@ -3,25 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libclocale \ -- libcnotify \ -- libcsplit \ -- libuna \ -- libcdirectory \ -- libcfile \ -- libcpath \ -- libbfio \ -- libfcache \ -- libfdata \ -- libfguid \ -- libfvalue \ -- libfmos \ -- libfplist \ -- libhmac \ -- libcaes \ - libmodi \ - moditools \ - pymodi \ -@@ -83,25 +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)/libcdirectory && $(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)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfmos && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfplist && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libhmac && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcaes && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libmodi && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - From 03c4881cb568b9e545bd7ee76b2148044db96ca9ee274289810de6bd3d70fe10 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Nov 2022 11:28:36 +0000 Subject: [PATCH 2/2] no patching -> no need for autoreconf OBS-URL: https://build.opensuse.org/package/show/security:forensics/libmodi?expand=0&rev=16 --- libmodi.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libmodi.spec b/libmodi.spec index ed4428a..a44d4f5 100644 --- a/libmodi.spec +++ b/libmodi.spec @@ -29,8 +29,6 @@ Source2: https://github.com/libyal/libmodi/releases/download/%version/lib Source3: %name.keyring BuildRequires: %{python_module devel} BuildRequires: c_compiler -BuildRequires: gettext-tools >= 0.21 -BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python-rpm-macros BuildRequires: pkgconfig(bzip2) @@ -105,7 +103,6 @@ read MacOS disk image formats. %autosetup -p1 %build -autoreconf -fi %{python_expand # echo "V_%version { global: *; };" >v.sym %configure --disable-static --enable-wide-character-type --enable-python \