From 78b580a9fdf3a4ebcff51bbcef6c099c3aa36f94e5f2ddd571922da529c805f5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Nov 2022 01:03:21 +0000 Subject: [PATCH] - Delete system-libs.patch OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfsxfs?expand=0&rev=20 --- libfsxfs.changes | 6 ++++ libfsxfs.spec | 9 +++-- system-libs.patch | 89 ----------------------------------------------- 3 files changed, 10 insertions(+), 94 deletions(-) delete mode 100644 system-libs.patch diff --git a/libfsxfs.changes b/libfsxfs.changes index 31070ae..49d3221 100644 --- a/libfsxfs.changes +++ b/libfsxfs.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) + ------------------------------------------------------------------- Tue Aug 30 14:58:21 UTC 2022 - Jan Engelhardt diff --git a/libfsxfs.spec b/libfsxfs.spec index adf415c..2ed6897 100644 --- a/libfsxfs.spec +++ b/libfsxfs.spec @@ -27,7 +27,6 @@ URL: https://github.com/libyal/libfsxfs Source: https://github.com/libyal/libfsxfs/releases/download/%version/libfsxfs-experimental-%version.tar.gz Source2: https://github.com/libyal/libfsxfs/releases/download/%version/libfsxfs-experimental-%version.tar.gz.asc Source3: %name.keyring -Patch1: system-libs.patch BuildRequires: %python_module devel BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.21 @@ -45,13 +44,14 @@ BuildRequires: pkgconfig(libcsplit) >= 20220109 BuildRequires: pkgconfig(libcthreads) >= 20220102 BuildRequires: pkgconfig(libfcache) >= 20220110 BuildRequires: pkgconfig(libfcrypto) >= 20210415 -BuildRequires: pkgconfig(libfdata) >= 20211023 +BuildRequires: pkgconfig(libfdata) >= 20220111 BuildRequires: pkgconfig(libfdatetime) >= 20220112 BuildRequires: pkgconfig(libfguid) >= 20220113 BuildRequires: pkgconfig(libhmac) >= 20220425 BuildRequires: pkgconfig(libuna) >= 20220611 BuildRequires: pkgconfig(python3) %python_subpackages +# Various notes: https://en.opensuse.org/libyal %description libfsxfs is a library to access the SGI X File System (XFS). @@ -91,21 +91,20 @@ reading SGI X File Systems (XFS). %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 7400ea4..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,89 +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 | 29 ----------------------------- - configure.ac | 15 --------------- - 2 files changed, 44 deletions(-) - -Index: libfsxfs/Makefile.am -=================================================================== ---- libfsxfs.orig/Makefile.am -+++ libfsxfs/Makefile.am -@@ -3,22 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libclocale \ -- libcnotify \ -- libcsplit \ -- libuna \ -- libcfile \ -- libcpath \ -- libbfio \ -- libfcache \ -- libfdata \ -- libfdatetime \ -- libfguid \ - libfsxfs \ -- libhmac \ - fsxfstools \ - pyfsxfs \ - pyfsxfs-python2 \ -@@ -79,20 +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)/libfsxfs && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libfsxfs/configure.ac -=================================================================== ---- libfsxfs.orig/configure.ac -+++ libfsxfs/configure.ac -@@ -173,25 +173,10 @@ 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([libfsxfs/Makefile]) - AC_CONFIG_FILES([pyfsxfs/Makefile]) - AC_CONFIG_FILES([pyfsxfs-python2/Makefile]) - AC_CONFIG_FILES([pyfsxfs-python3/Makefile]) --AC_CONFIG_FILES([libhmac/Makefile]) - AC_CONFIG_FILES([fsxfstools/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])