From 5dbff7dbc523358d8ffe739d708a89d04bfb56e972cffbfe6b65fd049148c894 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 26 Nov 2022 23:56:40 +0000 Subject: [PATCH] - Delete system-libs.patch OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfshfs?expand=0&rev=24 --- libfshfs.changes | 6 ++++ libfshfs.spec | 7 ++-- system-libs.patch | 87 ----------------------------------------------- 3 files changed, 9 insertions(+), 91 deletions(-) delete mode 100644 system-libs.patch diff --git a/libfshfs.changes b/libfshfs.changes index 758ad90..3f69d6e 100644 --- a/libfshfs.changes +++ b/libfshfs.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) + ------------------------------------------------------------------- Thu Sep 1 08:12:48 UTC 2022 - Jan Engelhardt diff --git a/libfshfs.spec b/libfshfs.spec index adc739b..9c5c6eb 100644 --- a/libfshfs.spec +++ b/libfshfs.spec @@ -27,7 +27,6 @@ URL: https://github.com/libyal/libfshfs Source: https://github.com/libyal/libfshfs/releases/download/%version/libfshfs-experimental-%version.tar.gz Source2: https://github.com/libyal/libfshfs/releases/download/%version/libfshfs-experimental-%version.tar.gz.asc Source3: %name.keyring -Patch1: system-libs.patch BuildRequires: %{python_module devel} BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.21 @@ -53,6 +52,7 @@ BuildRequires: pkgconfig(libhmac) >= 20220425 BuildRequires: pkgconfig(libuna) >= 20220601 BuildRequires: pkgconfig(zlib) %python_subpackages +# Various notes: https://en.opensuse.org/libyal %description Read-only supported HFS formats: @@ -133,21 +133,20 @@ applications that want to make use of libfshfs. %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 } %install -mv %_builddir/rt/* %buildroot/ +mv "%_builddir/rt"/* %buildroot/ find %{buildroot} -type f -name "*.la" -delete -print %post -n %{lname} -p /sbin/ldconfig diff --git a/system-libs.patch b/system-libs.patch deleted file mode 100644 index a4efbff..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,87 +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 | 31 ------------------------------- - configure.ac | 15 --------------- - 2 files changed, 46 deletions(-) - -Index: libfshfs-20220831/Makefile.am -=================================================================== ---- libfshfs-20220831.orig/Makefile.am -+++ libfshfs-20220831/Makefile.am -@@ -3,23 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libclocale \ -- libcnotify \ -- libcsplit \ -- libuna \ -- libcfile \ -- libcpath \ -- libbfio \ -- libfcache \ -- libfdata \ -- libfdatetime \ -- libfguid \ -- libfmos \ - libfshfs \ -- libhmac \ - fshfstools \ - pyfshfs \ - pyfshfs-python2 \ -@@ -79,21 +63,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)/libfmos && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libfshfs && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libfshfs-20220831/configure.ac -=================================================================== ---- libfshfs-20220831.orig/configure.ac -+++ libfshfs-20220831/configure.ac -@@ -182,21 +182,6 @@ dnl Generate Makefiles - AC_CONFIG_FILES([Makefile]) - AC_CONFIG_FILES([include/Makefile]) - AC_CONFIG_FILES([common/Makefile]) --AC_CONFIG_FILES([libcerror/Makefile]) --AC_CONFIG_FILES([libcthreads/Makefile]) --AC_CONFIG_FILES([libcdata/Makefile]) --AC_CONFIG_FILES([libclocale/Makefile]) --AC_CONFIG_FILES([libcnotify/Makefile]) --AC_CONFIG_FILES([libcsplit/Makefile]) --AC_CONFIG_FILES([libuna/Makefile]) --AC_CONFIG_FILES([libcfile/Makefile]) --AC_CONFIG_FILES([libcpath/Makefile]) --AC_CONFIG_FILES([libbfio/Makefile]) --AC_CONFIG_FILES([libfcache/Makefile]) --AC_CONFIG_FILES([libfdata/Makefile]) --AC_CONFIG_FILES([libfdatetime/Makefile]) --AC_CONFIG_FILES([libfguid/Makefile]) --AC_CONFIG_FILES([libfmos/Makefile]) - AC_CONFIG_FILES([libfshfs/Makefile]) - AC_CONFIG_FILES([pyfshfs/Makefile]) - AC_CONFIG_FILES([pyfshfs-python2/Makefile])