From b35b15635d99d572254455513046c36c807f99ab7d464b3a796827a0c5fb8f5f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 27 Nov 2022 11:12:33 +0000 Subject: [PATCH] - Delete system-libs.patch OBS-URL: https://build.opensuse.org/package/show/security:forensics/libevtx?expand=0&rev=38 --- libevtx.changes | 6 +++ libevtx.spec | 9 +--- system-libs.patch | 104 ---------------------------------------------- 3 files changed, 8 insertions(+), 111 deletions(-) delete mode 100644 system-libs.patch diff --git a/libevtx.changes b/libevtx.changes index 79d0027..15a25a8 100644 --- a/libevtx.changes +++ b/libevtx.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) + ------------------------------------------------------------------- Wed Nov 2 12:38:22 UTC 2022 - Jan Engelhardt diff --git a/libevtx.spec b/libevtx.spec index 8686b7c..ae5b409 100644 --- a/libevtx.spec +++ b/libevtx.spec @@ -28,11 +28,8 @@ Source: https://github.com/libyal/libevtx/releases/download/%version/lib Source2: https://github.com/libyal/libevtx/releases/download/%version/libevtx-alpha-%version.tar.gz.asc Source3: %name.keyring Source10: Windows_XML_Event_Log_EVTX.pdf -Patch1: system-libs.patch BuildRequires: %{python_module devel} BuildRequires: c_compiler -BuildRequires: gettext-tools >= 0.21 -BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python-rpm-macros BuildRequires: pkgconfig(libbfio) >= 20221025 @@ -58,6 +55,7 @@ BuildRequires: pkgconfig(libuna) >= 20220611 BuildRequires: pkgconfig(libwrc) >= 20220720 BuildRequires: pkgconfig(python3) %python_subpackages +# Various notes: https://en.opensuse.org/libyal %description Library and tools to access the Windows XML Event Log (EVTX) format. @@ -97,15 +95,12 @@ applications that want to make use of %name. cp %_sourcedir/*.pdf . %build -autoreconf -fi -# OOT builds are presently broken, so we have to install -# within each python iteration now, not in %%install. %{python_expand # -# see libcdata for version-sc echo "V_%version { global: *; };" >v.sym %configure --disable-static --enable-wide-character-type \ --enable-python PYTHON_VERSION="%{$python_bin_suffix}" \ LDFLAGS="-Wl,--version-script=$PWD/v.sym" +grep ' '' ''local' config.log && exit 1 %make_build %make_install DESTDIR="%_builddir/rt" %make_build clean diff --git a/system-libs.patch b/system-libs.patch deleted file mode 100644 index c445187..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,104 +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 | 38 -------------------------------------- - configure.ac | 21 --------------------- - 2 files changed, 59 deletions(-) - -Index: libevtx/Makefile.am -=================================================================== ---- libevtx.orig/Makefile.am -+++ libevtx/Makefile.am -@@ -3,28 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libclocale \ -- libcnotify \ -- libcsplit \ -- libuna \ -- libcfile \ -- libcpath \ -- libbfio \ -- libfcache \ -- libfdata \ -- libfdatetime \ -- libfguid \ -- libfvalue \ -- libfwevt \ -- libfwnt \ - libevtx \ -- libexe \ -- libregf \ -- libwrc \ -- libcdirectory \ - evtxtools \ - pyevtx \ - pyevtx-python2 \ -@@ -86,23 +65,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)/libcsplit && $(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)/libfcache && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfwevt && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfwnt && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libevtx && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libevtx/configure.ac -=================================================================== ---- libevtx.orig/configure.ac -+++ libevtx/configure.ac -@@ -191,31 +191,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([libfcache/Makefile]) --AC_CONFIG_FILES([libfdata/Makefile]) --AC_CONFIG_FILES([libfdatetime/Makefile]) --AC_CONFIG_FILES([libfguid/Makefile]) --AC_CONFIG_FILES([libfvalue/Makefile]) --AC_CONFIG_FILES([libfwevt/Makefile]) --AC_CONFIG_FILES([libfwnt/Makefile]) - AC_CONFIG_FILES([libevtx/Makefile]) - AC_CONFIG_FILES([pyevtx/Makefile]) - AC_CONFIG_FILES([pyevtx-python2/Makefile]) - AC_CONFIG_FILES([pyevtx-python3/Makefile]) --AC_CONFIG_FILES([libexe/Makefile]) --AC_CONFIG_FILES([libregf/Makefile]) --AC_CONFIG_FILES([libwrc/Makefile]) --AC_CONFIG_FILES([libcdirectory/Makefile]) - AC_CONFIG_FILES([evtxtools/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])