From 998f2a80933a18dc64d8b533d7c165242d600f456da86f6c2a73bc3bc2fa8643 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 26 Nov 2022 22:54:26 +0000 Subject: [PATCH 1/2] - Delete system-libs.patch OBS-URL: https://build.opensuse.org/package/show/security:forensics/libcpath?expand=0&rev=12 --- libcpath.changes | 6 ++++++ libcpath.spec | 10 +++++----- system-libs.patch | 46 ---------------------------------------------- 3 files changed, 11 insertions(+), 51 deletions(-) delete mode 100644 system-libs.patch diff --git a/libcpath.changes b/libcpath.changes index dbf10e0..256bda6 100644 --- a/libcpath.changes +++ b/libcpath.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/libcpath.spec b/libcpath.spec index eb6a132..814c1eb 100644 --- a/libcpath.spec +++ b/libcpath.spec @@ -27,15 +27,15 @@ URL: https://github.com/libyal/libcpath Source: https://github.com/libyal/libcpath/releases/download/%version/libcpath-alpha-%version.tar.gz Source2: https://github.com/libyal/libcpath/releases/download/%version/libcpath-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(libcerror) >= 20201121 -BuildRequires: pkgconfig(libclocale) >= 20200913 -BuildRequires: pkgconfig(libcsplit) >= 20200703 +BuildRequires: pkgconfig(libcerror) >= 20220101 +BuildRequires: pkgconfig(libclocale) >= 20220107 +BuildRequires: pkgconfig(libcsplit) >= 20210411 BuildRequires: pkgconfig(libuna) >= 20210801 +# Various notes: https://en.opensuse.org/libyal %description A library for C path functions. Part of the libyal family of libraries. @@ -63,9 +63,9 @@ applications that want to make use of libcpath. %build autoreconf -fi -# see libcdata for version-sc echo "V_%version { global: *; };" >v.sym %configure --disable-static --enable-wide-character-type 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 8b9e135..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- - Makefile.am | 8 -------- - configure.ac | 4 ---- - 2 files changed, 12 deletions(-) - -Index: libcpath/Makefile.am -=================================================================== ---- libcpath.orig/Makefile.am -+++ libcpath/Makefile.am -@@ -3,10 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libclocale \ -- libcsplit \ -- libuna \ - libcpath \ - po \ - manuals \ -@@ -56,10 +52,6 @@ lib: library - - library: - cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS) -- cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS) -- cd $(srcdir)/libclocale && $(MAKE) $(AM_MAKEFLAGS) -- cd $(srcdir)/libcsplit && $(MAKE) $(AM_MAKEFLAGS) -- cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS) - cd $(srcdir)/libcpath && $(MAKE) $(AM_MAKEFLAGS) - cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS) - -Index: libcpath/configure.ac -=================================================================== ---- libcpath.orig/configure.ac -+++ libcpath/configure.ac -@@ -109,10 +109,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([libclocale/Makefile]) --AC_CONFIG_FILES([libcsplit/Makefile]) --AC_CONFIG_FILES([libuna/Makefile]) - AC_CONFIG_FILES([libcpath/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars]) From 8984f7da19719638aa253731ac55bddc7dc680ce80174d361047c15f66297a9c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Nov 2022 11:02:20 +0000 Subject: [PATCH 2/2] no patching -> no need for autoreconf OBS-URL: https://build.opensuse.org/package/show/security:forensics/libcpath?expand=0&rev=13 --- libcpath.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/libcpath.spec b/libcpath.spec index 814c1eb..5b78814 100644 --- a/libcpath.spec +++ b/libcpath.spec @@ -28,8 +28,6 @@ Source: https://github.com/libyal/libcpath/releases/download/%version/li Source2: https://github.com/libyal/libcpath/releases/download/%version/libcpath-alpha-%version.tar.gz.asc Source9: %name.keyring BuildRequires: c_compiler -BuildRequires: gettext-tools >= 0.18.1 -BuildRequires: libtool BuildRequires: pkg-config BuildRequires: pkgconfig(libcerror) >= 20220101 BuildRequires: pkgconfig(libclocale) >= 20220107 @@ -62,7 +60,6 @@ applications that want to make use of libcpath. %autosetup -p1 %build -autoreconf -fi echo "V_%version { global: *; };" >v.sym %configure --disable-static --enable-wide-character-type LDFLAGS="-Wl,--version-script=$PWD/v.sym" grep ' local' config.log && exit 1