From 6efbca82f58760cff9ead5adc39d19837cd52507e3d3f6343011ce677c8fe116 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Nov 2022 10:43:58 +0000 Subject: [PATCH] - Delete system-libs.patch OBS-URL: https://build.opensuse.org/package/show/security:forensics/libnk2?expand=0&rev=7 --- libnk2.changes | 6 ++++ libnk2.spec | 5 ++- system-libs.patch | 89 ----------------------------------------------- 3 files changed, 8 insertions(+), 92 deletions(-) delete mode 100644 system-libs.patch diff --git a/libnk2.changes b/libnk2.changes index bbbd226..17e6a03 100644 --- a/libnk2.changes +++ b/libnk2.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) + ------------------------------------------------------------------- Tue Nov 22 10:24:08 UTC 2022 - Jan Engelhardt diff --git a/libnk2.spec b/libnk2.spec index 94470a6..43ad545 100644 --- a/libnk2.spec +++ b/libnk2.spec @@ -27,7 +27,6 @@ URL: https://github.com/libyal/libnk2 Source: https://github.com/libyal/libnk2/releases/download/%version/libnk2-alpha-%version.tar.gz Source2: https://github.com/libyal/libnk2/releases/download/%version/libnk2-alpha-%version.tar.gz.asc Source3: %name.keyring -Patch1: system-libs.patch BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.18.1 BuildRequires: libtool @@ -47,6 +46,7 @@ BuildRequires: pkgconfig(libfmapi) >= 20220114 BuildRequires: pkgconfig(libfvalue) >= 20220120 BuildRequires: pkgconfig(libfwnt) >= 20220922 BuildRequires: pkgconfig(libuna) >= 20220611 +# Various notes: https://en.opensuse.org/libyal %description libnk2 is a library to access Outlook's Nickfile (NK2) format. @@ -85,10 +85,9 @@ read Outlook Nickfile files. %autosetup -p1 %build -if [ ! -e configure ]; then ./autogen.sh; 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 95590c0..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,89 +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 | 29 ----------------------------- - configure.ac | 15 --------------- - 2 files changed, 44 deletions(-) - -Index: libnk2/Makefile.am -=================================================================== ---- libnk2.orig/Makefile.am -+++ libnk2/Makefile.am -@@ -3,22 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libclocale \ -- libcnotify \ -- libcsplit \ -- libuna \ -- libcfile \ -- libcpath \ -- libbfio \ -- libfdatetime \ -- libfguid \ -- libfwnt \ -- libfmapi \ - libnk2 \ -- libfvalue \ - nk2tools \ - pynk2 \ - pynk2-python2 \ -@@ -79,20 +64,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)/libclocale && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcplit && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcfile && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcpath && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libbfio && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfwnt && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfmapi && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libnk2 && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libnk2/configure.ac -=================================================================== ---- libnk2.orig/configure.ac -+++ libnk2/configure.ac -@@ -173,25 +173,10 @@ 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([libclocale/Makefile]) --AC_CONFIG_FILES([libcnotify/Makefile]) --AC_CONFIG_FILES([libcsplit/Makefile]) --AC_CONFIG_FILES([libuna/Makefile]) --AC_CONFIG_FILES([libcfile/Makefile]) --AC_CONFIG_FILES([libcpath/Makefile]) --AC_CONFIG_FILES([libbfio/Makefile]) --AC_CONFIG_FILES([libfdatetime/Makefile]) --AC_CONFIG_FILES([libfguid/Makefile]) --AC_CONFIG_FILES([libfwnt/Makefile]) --AC_CONFIG_FILES([libfmapi/Makefile]) - AC_CONFIG_FILES([libnk2/Makefile]) - AC_CONFIG_FILES([pynk2/Makefile]) - AC_CONFIG_FILES([pynk2-python2/Makefile]) - AC_CONFIG_FILES([pynk2-python3/Makefile]) --AC_CONFIG_FILES([libfvalue/Makefile]) - AC_CONFIG_FILES([nk2tools/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])