diff --git a/libfcache.changes b/libfcache.changes index f36cdba..bb6c84e 100644 --- a/libfcache.changes +++ b/libfcache.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/libfcache.spec b/libfcache.spec index 0998719..ebfd065 100644 --- a/libfcache.spec +++ b/libfcache.spec @@ -27,14 +27,14 @@ URL: https://github.com/libyal/libfcache Source: https://github.com/libyal/libfcache/releases/download/%version/libfcache-alpha-%version.tar.gz Source2: https://github.com/libyal/libfcache/releases/download/%version/libfcache-alpha-%version.tar.gz.asc Source9: %name.keyring -Patch1: system-libs.patch BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.18.1 BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(libcdata) >= 20210625 -BuildRequires: pkgconfig(libcerror) >= 20201121 -BuildRequires: pkgconfig(libcthreads) >= 20200508 +BuildRequires: pkgconfig(libcerror) >= 20220101 +BuildRequires: pkgconfig(libcthreads) >= 20220102 +# Various notes: https://en.opensuse.org/libyal %description Library to provide generic file data cache functions for the libyal family of libraries. @@ -62,9 +62,9 @@ applications that want to make use of libfcache. %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 ddc7b59..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,49 +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 | 6 ------ - configure.ac | 3 --- - 2 files changed, 9 deletions(-) - -Index: libfcache/Makefile.am -=================================================================== ---- libfcache.orig/Makefile.am -+++ libfcache/Makefile.am -@@ -3,9 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ - libfcache \ - po \ - manuals \ -@@ -55,9 +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)/libfcache && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libfcache/configure.ac -=================================================================== ---- libfcache.orig/configure.ac -+++ libfcache/configure.ac -@@ -97,9 +97,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([libfcache/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])