From 4baf869303f0a8edac9b499bfed4cf562b67766e0d88ad5131330b64a095a7bf Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Nov 2022 11:18:12 +0000 Subject: [PATCH] no patching -> no need for autoreconf OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfmapi?expand=0&rev=12 --- libfmapi.changes | 6 +++++ libfmapi.spec | 19 ++++++-------- system-libs.patch | 64 ----------------------------------------------- 3 files changed, 14 insertions(+), 75 deletions(-) delete mode 100644 system-libs.patch diff --git a/libfmapi.changes b/libfmapi.changes index d804c16..9be608d 100644 --- a/libfmapi.changes +++ b/libfmapi.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/libfmapi.spec b/libfmapi.spec index a0aa93c..cee3938 100644 --- a/libfmapi.spec +++ b/libfmapi.spec @@ -27,19 +27,17 @@ URL: https://github.com/libyal/libfmapi Source: https://github.com/libyal/libfmapi/releases/download/%version/libfmapi-experimental-%version.tar.gz Source2: https://github.com/libyal/libfmapi/releases/download/%version/libfmapi-experimental-%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(libcdata) >= 20210625 -BuildRequires: pkgconfig(libcerror) >= 20201121 -BuildRequires: pkgconfig(libcnotify) >= 20200913 -BuildRequires: pkgconfig(libcthreads) >= 20200508 -BuildRequires: pkgconfig(libfdatetime) >= 20180910 -BuildRequires: pkgconfig(libfguid) >= 20180724 -BuildRequires: pkgconfig(libfwnt) >= 20210421 +BuildRequires: pkgconfig(libcerror) >= 20220101 +BuildRequires: pkgconfig(libcnotify) >= 20220108 +BuildRequires: pkgconfig(libcthreads) >= 20220102 +BuildRequires: pkgconfig(libfdatetime) >= 20220112 +BuildRequires: pkgconfig(libfguid) >= 20220113 +BuildRequires: pkgconfig(libfwnt) >= 20210717 BuildRequires: pkgconfig(libuna) >= 20220102 +# Various notes: https://en.opensuse.org/libyal %description A library for MAPI data types @@ -70,10 +68,9 @@ applications that want to make use of libfmapi. %autosetup -p1 %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 52b1881..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,64 +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 | 16 ---------------- - configure.ac | 8 -------- - 2 files changed, 24 deletions(-) - -Index: libfmapi/Makefile.am -=================================================================== ---- libfmapi.orig/Makefile.am -+++ libfmapi/Makefile.am -@@ -3,14 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libcnotify \ -- libuna \ -- libfdatetime \ -- libfguid \ -- libfwnt \ - libfmapi \ - po \ - manuals \ -@@ -60,14 +52,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)/libcnotify && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libuna && $(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)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libfmapi/configure.ac -=================================================================== ---- libfmapi.orig/configure.ac -+++ libfmapi/configure.ac -@@ -118,14 +118,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([libcthreads/Makefile]) --AC_CONFIG_FILES([libcdata/Makefile]) --AC_CONFIG_FILES([libcnotify/Makefile]) --AC_CONFIG_FILES([libuna/Makefile]) --AC_CONFIG_FILES([libfdatetime/Makefile]) --AC_CONFIG_FILES([libfguid/Makefile]) --AC_CONFIG_FILES([libfwnt/Makefile]) - AC_CONFIG_FILES([libfmapi/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])