From fc4e05fc471c5d7ba77dbe0ed1d8ac6026c1fac275e915e26a6baf44307bf5e7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 26 Nov 2022 23:02:53 +0000 Subject: [PATCH] - Delete system-libs.patch OBS-URL: https://build.opensuse.org/package/show/security:forensics/libcsplit?expand=0&rev=12 --- libcsplit.changes | 6 ++++++ libcsplit.spec | 17 +++-------------- system-libs.patch | 43 ------------------------------------------- 3 files changed, 9 insertions(+), 57 deletions(-) delete mode 100644 system-libs.patch diff --git a/libcsplit.changes b/libcsplit.changes index 999f03e..5ee3b98 100644 --- a/libcsplit.changes +++ b/libcsplit.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/libcsplit.spec b/libcsplit.spec index 13fd8e3..b7ada4c 100644 --- a/libcsplit.spec +++ b/libcsplit.spec @@ -27,12 +27,12 @@ URL: https://github.com/libyal/libcsplit Source: https://github.com/libyal/libcsplit/releases/download/%version/libcsplit-beta-%version.tar.gz Source2: https://github.com/libyal/libcsplit/releases/download/%version/libcsplit-beta-%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(libcerror) >= 20220101 +# Various notes: https://en.opensuse.org/libyal %description A library for C split string functions. @@ -48,17 +48,6 @@ Library for C split string functions. Part of the libyal family of libraries. -Also see: - - libcdata; generic data functions - libcdatetime; date and time functions - libcerror; error functions - libclocale; locale functions - libcnotify; notification functions - libcfile; file functions - libcpath; path functions - libcthreads; threads functions - %package devel Summary: Development files for libcsplit, a C split string library Group: Development/Libraries/C and C++ @@ -75,9 +64,9 @@ applications that want to make use of libcsplit. %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 2e91b92..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: libcsplit-20210411/Makefile.am -=================================================================== ---- libcsplit-20210411.orig/Makefile.am -+++ libcsplit-20210411/Makefile.am -@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ - libcsplit \ - po \ - manuals \ -@@ -53,7 +52,6 @@ lib: library - - library: - cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS) -- cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS) - cd $(srcdir)/libcsplit && $(MAKE) $(AM_MAKEFLAGS) - cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS) - -Index: libcsplit-20210411/configure.ac -=================================================================== ---- libcsplit-20210411.orig/configure.ac -+++ libcsplit-20210411/configure.ac -@@ -94,7 +94,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([libcsplit/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])