From f417bd779db955ab2d619466a2081b5b17f5a4842463e6671fe0e60925d0dfb5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 26 Nov 2022 23:48:20 +0000 Subject: [PATCH] - Delete system-libs.patch OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfplist?expand=0&rev=6 --- libfplist.changes | 6 +++++ libfplist.spec | 4 ++-- system-libs.patch | 61 ----------------------------------------------- 3 files changed, 8 insertions(+), 63 deletions(-) delete mode 100644 system-libs.patch diff --git a/libfplist.changes b/libfplist.changes index 124b375..232756f 100644 --- a/libfplist.changes +++ b/libfplist.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) + ------------------------------------------------------------------- Mon Aug 8 11:37:44 UTC 2022 - Jan Engelhardt diff --git a/libfplist.spec b/libfplist.spec index 9b24d62..f08a85f 100644 --- a/libfplist.spec +++ b/libfplist.spec @@ -27,7 +27,6 @@ URL: https://github.com/libyal/libfplist Source: https://github.com/libyal/libfplist/releases/download/%version/libfplist-experimental-%version.tar.gz Source2: https://github.com/libyal/libfplist/releases/download/%version/libfplist-experimental-%version.tar.gz.asc Source9: %name.keyring -Patch1: system-libs.patch BuildRequires: bison BuildRequires: c_compiler BuildRequires: flex @@ -41,6 +40,7 @@ BuildRequires: pkgconfig(libcthreads) >= 20220102 BuildRequires: pkgconfig(libfguid) >= 20220113 BuildRequires: pkgconfig(libfvalue) >= 20210510 BuildRequires: pkgconfig(libuna) >= 20220102 +# Various notes: https://en.opensuse.org/libyal %description libfplist is a library for plist formats. @@ -81,9 +81,9 @@ applications that want to make use of libfplist. %build autoreconf -fi -# see libcdata for version-sc echo "V_%version { global: *; };" >v.sym %configure --disable-static LDFLAGS="-Wl,--version-script=$PWD/v.sym" +grep ' local' config.log && exit 1 %make_build %install diff --git a/system-libs.patch b/system-libs.patch deleted file mode 100644 index 0141843..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,61 +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 | 14 -------------- - configure.ac | 7 ------- - 2 files changed, 21 deletions(-) - -Index: libfplist/Makefile.am -=================================================================== ---- libfplist.orig/Makefile.am -+++ libfplist/Makefile.am -@@ -3,13 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libcnotify \ -- libuna \ -- libfguid \ -- libfvalue \ - libfplist \ - po \ - manuals \ -@@ -60,13 +53,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)/libcnotify && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libfplist && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libfplist/configure.ac -=================================================================== ---- libfplist.orig/configure.ac -+++ libfplist/configure.ac -@@ -117,13 +117,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([libcnotify/Makefile]) --AC_CONFIG_FILES([libuna/Makefile]) --AC_CONFIG_FILES([libfguid/Makefile]) --AC_CONFIG_FILES([libfvalue/Makefile]) - AC_CONFIG_FILES([libfplist/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])