From 96ded861d48623943b121825fbb1f072ac9660417fe35568f9dbe9ecf27ee4a9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Nov 2022 09:56:07 +0000 Subject: [PATCH] - Delete system-libs.patch OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfwsi?expand=0&rev=30 --- libfwsi.changes | 6 ++++ libfwsi.spec | 7 ++--- system-libs.patch | 70 ----------------------------------------------- 3 files changed, 9 insertions(+), 74 deletions(-) delete mode 100644 system-libs.patch diff --git a/libfwsi.changes b/libfwsi.changes index 7e46f73..e47904a 100644 --- a/libfwsi.changes +++ b/libfwsi.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:00:59 UTC 2022 - Jan Engelhardt diff --git a/libfwsi.spec b/libfwsi.spec index da3a0ad..ab99626 100644 --- a/libfwsi.spec +++ b/libfwsi.spec @@ -28,7 +28,6 @@ Source: https://github.com/libyal/libfwsi/releases/download/%version/lib Source2: https://github.com/libyal/libfwsi/releases/download/%version/libfwsi-experimental-%version.tar.gz.asc Source3: %name.keyring Source9: Windows_Shell_Item_format.pdf -Patch1: system-libs.patch BuildRequires: %{python_module devel} BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.21 @@ -46,6 +45,7 @@ BuildRequires: pkgconfig(libfole) >= 20220115 BuildRequires: pkgconfig(libfwps) >= 20220122 BuildRequires: pkgconfig(libuna) >= 20220611 %python_subpackages +# Various notes: https://en.opensuse.org/libyal %description Library to access the Windows Shell Item format for the libyal family of libraries. @@ -78,21 +78,20 @@ cp %_sourcedir/*.pdf . %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-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 d75fdb6..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,70 +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 | 20 -------------------- - configure.ac | 10 ---------- - 2 files changed, 30 deletions(-) - -Index: libfwsi/Makefile.am -=================================================================== ---- libfwsi.orig/Makefile.am -+++ libfwsi/Makefile.am -@@ -3,16 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libclocale \ -- libcnotify \ -- libuna \ -- libfdatetime \ -- libfguid \ -- libfole \ -- libfwps \ - libfwsi \ - pyfwsi \ - pyfwsi-python2 \ -@@ -72,16 +62,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)/libuna && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfole && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfwps && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libfwsi && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libfwsi/configure.ac -=================================================================== ---- libfwsi.orig/configure.ac -+++ libfwsi/configure.ac -@@ -142,16 +142,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([libuna/Makefile]) --AC_CONFIG_FILES([libfdatetime/Makefile]) --AC_CONFIG_FILES([libfguid/Makefile]) --AC_CONFIG_FILES([libfole/Makefile]) --AC_CONFIG_FILES([libfwps/Makefile]) - AC_CONFIG_FILES([libfwsi/Makefile]) - AC_CONFIG_FILES([pyfwsi/Makefile]) - AC_CONFIG_FILES([pyfwsi-python2/Makefile])