From d608202aa64e17d1ccda4e8594355bfea0a7666f187b13cc8fd2e32deebb893d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 26 Nov 2022 23:30:16 +0000 Subject: [PATCH 1/2] - Delete system-libs.patch OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfdatetime?expand=0&rev=15 --- libfdatetime.changes | 6 ++++++ libfdatetime.spec | 4 ++-- system-libs.patch | 43 ------------------------------------------- 3 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 system-libs.patch diff --git a/libfdatetime.changes b/libfdatetime.changes index 0f83e64..62372ea 100644 --- a/libfdatetime.changes +++ b/libfdatetime.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/libfdatetime.spec b/libfdatetime.spec index 31668ac..3a41234 100644 --- a/libfdatetime.spec +++ b/libfdatetime.spec @@ -27,12 +27,12 @@ URL: https://github.com/libyal/libfdatetime Source: https://github.com/libyal/libfdatetime/releases/download/%version/libfdatetime-alpha-%version.tar.gz Source2: https://github.com/libyal/libfdatetime/releases/download/%version/libfdatetime-alpha-%version.tar.gz.asc Source3: %name.keyring -Patch1: system-libs.patch BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.18.1 BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(libcerror) >= 20220101 +# Various notes: https://en.opensuse.org/libyal %description A library for date and time data types. Part of the libyal family of libraries. @@ -60,9 +60,9 @@ applications that want to make use of libfdatetime. %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 59b3301..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,43 +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 | 2 -- - configure.ac | 1 - - 2 files changed, 3 deletions(-) - -Index: libfdatetime/Makefile.am -=================================================================== ---- libfdatetime.orig/Makefile.am -+++ libfdatetime/Makefile.am -@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ - libfdatetime \ - po \ - tests \ -@@ -53,7 +52,6 @@ lib: library - - library: - (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libfdatetime/configure.ac -=================================================================== ---- libfdatetime.orig/configure.ac -+++ libfdatetime/configure.ac -@@ -91,7 +91,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([libfdatetime/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars]) From 052c8e2e0a55a0383ab034ad10fbfe4065a960dc1109c8bfdb6e7c14532f2556 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Nov 2022 11:14:41 +0000 Subject: [PATCH 2/2] no patching -> no need for autoreconf OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfdatetime?expand=0&rev=16 --- libfdatetime.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libfdatetime.spec b/libfdatetime.spec index 3a41234..2b8ab19 100644 --- a/libfdatetime.spec +++ b/libfdatetime.spec @@ -28,8 +28,6 @@ Source: https://github.com/libyal/libfdatetime/releases/download/%versio Source2: https://github.com/libyal/libfdatetime/releases/download/%version/libfdatetime-alpha-%version.tar.gz.asc Source3: %name.keyring BuildRequires: c_compiler -BuildRequires: gettext-tools >= 0.18.1 -BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(libcerror) >= 20220101 # Various notes: https://en.opensuse.org/libyal @@ -59,7 +57,6 @@ applications that want to make use of libfdatetime. %autosetup -p1 %build -autoreconf -fi echo "V_%version { global: *; };" >v.sym %configure --disable-static LDFLAGS="-Wl,--version-script=$PWD/v.sym" grep ' local' config.log && exit 1