From 30f8753008df5d5e33a2387a79003f5e88c8debc13986fda55429341e21b0bec Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Nov 2022 09:49:23 +0000 Subject: [PATCH] - Delete system-libs.patch OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfvalue?expand=0&rev=18 --- libfvalue.changes | 6 +++++ libfvalue.spec | 4 +-- system-libs.patch | 64 ----------------------------------------------- 3 files changed, 8 insertions(+), 66 deletions(-) delete mode 100644 system-libs.patch diff --git a/libfvalue.changes b/libfvalue.changes index 258adf1..44fddda 100644 --- a/libfvalue.changes +++ b/libfvalue.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/libfvalue.spec b/libfvalue.spec index 1a6dc50..d03c047 100644 --- a/libfvalue.spec +++ b/libfvalue.spec @@ -27,7 +27,6 @@ URL: https://github.com/libyal/libfvalue Source: https://github.com/libyal/libfvalue/releases/download/%version/libfvalue-experimental-%version.tar.gz Source2: https://github.com/libyal/libfvalue/releases/download/%version/libfvalue-experimental-%version.tar.gz.asc Source9: %name.keyring -Patch1: system-libs.patch BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.18.1 BuildRequires: libtool @@ -40,6 +39,7 @@ BuildRequires: pkgconfig(libfdatetime) >= 20220112 BuildRequires: pkgconfig(libfguid) >= 20220113 BuildRequires: pkgconfig(libfwnt) >= 20210906 BuildRequires: pkgconfig(libuna) >= 20220102 +# Various notes: https://en.opensuse.org/libyal %description Library to provide generic file value functions for the libyal family of libraries. @@ -67,9 +67,9 @@ applications that want to make use of libfvalue. %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 2eb2103..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,64 +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 | 16 ---------------- - configure.ac | 8 -------- - 2 files changed, 24 deletions(-) - -Index: libfvalue/Makefile.am -=================================================================== ---- libfvalue.orig/Makefile.am -+++ libfvalue/Makefile.am -@@ -3,14 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libcnotify \ -- libuna \ -- libfdatetime \ -- libfguid \ -- libfwnt \ - libfvalue \ - po \ - manuals \ -@@ -60,14 +52,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)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfwnt && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libfvalue/configure.ac -=================================================================== ---- libfvalue.orig/configure.ac -+++ libfvalue/configure.ac -@@ -118,14 +118,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([libfdatetime/Makefile]) --AC_CONFIG_FILES([libfguid/Makefile]) --AC_CONFIG_FILES([libfwnt/Makefile]) - AC_CONFIG_FILES([libfvalue/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])