diff --git a/libftxr.changes b/libftxr.changes index 3216cc2..b655bc9 100644 --- a/libftxr.changes +++ b/libftxr.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/libftxr.spec b/libftxr.spec index 8c0cbc9..26202c5 100644 --- a/libftxr.spec +++ b/libftxr.spec @@ -27,7 +27,6 @@ URL: https://github.com/libyal/libftxr Source: https://github.com/libyal/libftxr/releases/download/%version/libftxr-experimental-%version.tar.gz Source2: https://github.com/libyal/libftxr/releases/download/%version/libftxr-experimental-%version.tar.gz.asc Source9: %name.keyring -Patch1: system-libs.patch BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.18.1 BuildRequires: libtool @@ -38,6 +37,7 @@ BuildRequires: pkgconfig(libfdatetime) >= 20220112 BuildRequires: pkgconfig(libfguid) >= 20220113 BuildRequires: pkgconfig(libfusn) >= 20180726 BuildRequires: pkgconfig(libuna) >= 20220102 +# Various notes: https://en.opensuse.org/libyal %description libftxr is a library for Transactional Registry (TxR) data types. @@ -69,9 +69,9 @@ applications that want to make use of libftxr. %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 0cd0e27..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,58 +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 | 12 ------------ - configure.ac | 6 ------ - 2 files changed, 18 deletions(-) - -Index: libftxr/Makefile.am -=================================================================== ---- libftxr.orig/Makefile.am -+++ libftxr/Makefile.am -@@ -3,12 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcnotify \ -- libuna \ -- libfdatetime \ -- libfguid \ -- libfusn \ - libftxr \ - po \ - manuals \ -@@ -59,12 +53,6 @@ lib: library - - library: - (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcerror && $(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)/libfusn && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libftxr && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libftxr/configure.ac -=================================================================== ---- libftxr.orig/configure.ac -+++ libftxr/configure.ac -@@ -114,12 +114,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([libcnotify/Makefile]) --AC_CONFIG_FILES([libuna/Makefile]) --AC_CONFIG_FILES([libfdatetime/Makefile]) --AC_CONFIG_FILES([libfguid/Makefile]) --AC_CONFIG_FILES([libfusn/Makefile]) - AC_CONFIG_FILES([libftxr/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])