diff --git a/libmsiecf.changes b/libmsiecf.changes index fd5910b..57b50ac 100644 --- a/libmsiecf.changes +++ b/libmsiecf.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 Oct 24 08:46:52 UTC 2022 - Jan Engelhardt diff --git a/libmsiecf.spec b/libmsiecf.spec index dec69aa..e7bba4d 100644 --- a/libmsiecf.spec +++ b/libmsiecf.spec @@ -28,7 +28,6 @@ Source: https://github.com/libyal/libmsiecf/releases/download/%version/l Source2: https://github.com/libyal/libmsiecf/releases/download/%version/libmsiecf-alpha-%version.tar.gz.asc Source3: %name.keyring Source8: MSIE_Cache_File_index.dat_format.pdf -Patch1: system-libs.patch BuildRequires: %{python_module devel} BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.21 @@ -50,6 +49,7 @@ BuildRequires: pkgconfig(libfole) >= 20220115 BuildRequires: pkgconfig(libfvalue) >= 20220120 BuildRequires: pkgconfig(libuna) >= 20220611 %python_subpackages +# Various notes: https://en.opensuse.org/libyal %description libmsiecf is a library to parse MS Internet Explorer Cache Files. @@ -88,14 +88,12 @@ 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 e2711eb..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,82 +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 | 28 ---------------------------- - configure.ac | 14 -------------- - 2 files changed, 42 deletions(-) - -Index: libmsiecf/Makefile.am -=================================================================== ---- libmsiecf.orig/Makefile.am -+++ libmsiecf/Makefile.am -@@ -3,20 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libclocale \ -- libcnotify \ -- libcsplit \ -- libuna \ -- libcfile \ -- libcpath \ -- libbfio \ -- libfdatetime \ -- libfguid \ -- libfole \ -- libfvalue \ - libmsiecf \ - msiecftools \ - pymsiecf \ -@@ -78,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)/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)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfole && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libmsiecf && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libmsiecf/configure.ac -=================================================================== ---- libmsiecf.orig/configure.ac -+++ libmsiecf/configure.ac -@@ -163,20 +163,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([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([libfole/Makefile]) --AC_CONFIG_FILES([libfvalue/Makefile]) - AC_CONFIG_FILES([libmsiecf/Makefile]) - AC_CONFIG_FILES([pymsiecf/Makefile]) - AC_CONFIG_FILES([pymsiecf-python2/Makefile])