diff --git a/libsmraw.changes b/libsmraw.changes index 16b6954..2deab31 100644 --- a/libsmraw.changes +++ b/libsmraw.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) + ------------------------------------------------------------------- Sat Oct 29 23:08:02 UTC 2022 - Jan Engelhardt diff --git a/libsmraw.spec b/libsmraw.spec index 09cabaa..6e2d5d5 100644 --- a/libsmraw.spec +++ b/libsmraw.spec @@ -27,7 +27,6 @@ URL: https://github.com/libyal/libsmraw Source: https://github.com/libyal/libsmraw/releases/download/%version/libsmraw-alpha-%version.tar.gz Source2: https://github.com/libyal/libsmraw/releases/download/%version/libsmraw-alpha-%version.tar.gz.asc Source3: %name.keyring -Patch1: system-libs.patch BuildRequires: %{python_module devel} BuildRequires: c_compiler BuildRequires: gettext-tools >= 0.21 @@ -51,6 +50,7 @@ BuildRequires: pkgconfig(libhmac) >= 20220425 BuildRequires: pkgconfig(libuna) >= 20220611 BuildRequires: pkgconfig(openssl) >= 1.0 %python_subpackages +# Various notes: https://en.opensuse.org/libyal %description libsmraw is a library to access the storage media RAW format. @@ -88,14 +88,12 @@ acquire, export, query and verify storage media (split) RAW files. %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 5a630b9..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,87 +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 | 27 --------------------------- - configure.ac | 14 -------------- - 2 files changed, 41 deletions(-) - -Index: libsmraw/Makefile.am -=================================================================== ---- libsmraw.orig/Makefile.am -+++ libsmraw/Makefile.am -@@ -3,21 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libclocale \ -- libcnotify \ -- libcsplit \ -- libuna \ -- libcfile \ -- libcpath \ -- libbfio \ -- libfcache \ -- libfdata \ -- libfvalue \ - libsmraw \ -- libhmac \ - smrawtools \ - smraw.net \ - pysmraw \ -@@ -79,19 +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)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libsmraw && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libsmraw/configure.ac -=================================================================== ---- libsmraw.orig/configure.ac -+++ libsmraw/configure.ac -@@ -173,25 +173,11 @@ 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([libfvalue/Makefile]) - AC_CONFIG_FILES([libsmraw/Makefile]) - AC_CONFIG_FILES([pysmraw/Makefile]) - AC_CONFIG_FILES([pysmraw-python2/Makefile]) - AC_CONFIG_FILES([pysmraw-python3/Makefile]) - AC_CONFIG_FILES([smraw.net/Makefile]) --AC_CONFIG_FILES([libhmac/Makefile]) - AC_CONFIG_FILES([smrawtools/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])