diff --git a/libluksde.changes b/libluksde.changes index 1a8353f..c8a59b1 100644 --- a/libluksde.changes +++ b/libluksde.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) + ------------------------------------------------------------------- Thu Nov 3 10:37:01 UTC 2022 - Jan Engelhardt diff --git a/libluksde.spec b/libluksde.spec index 35d74e2..493ef45 100644 --- a/libluksde.spec +++ b/libluksde.spec @@ -27,11 +27,8 @@ URL: https://github.com/libyal/libluksde Source: https://github.com/libyal/libluksde/releases/download/%version/libluksde-experimental-%version.tar.gz Source2: https://github.com/libyal/libluksde/releases/download/%version/libluksde-experimental-%version.tar.gz.asc Source9: %name.keyring -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) >= 20220120 @@ -52,6 +49,7 @@ BuildRequires: pkgconfig(libhmac) >= 20220425 BuildRequires: pkgconfig(libuna) >= 20220611 BuildRequires: pkgconfig(python3) %python_subpackages +# Various notes: https://en.opensuse.org/libyal %description Library and tools to access the New Technology File System (NTFS). @@ -90,15 +88,12 @@ applications that want to make use of %{name}. %autosetup -p1 %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 69b0893..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,86 +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 | 31 ------------------------------- - configure.ac | 15 --------------- - 2 files changed, 46 deletions(-) - -Index: libluksde-20220807/Makefile.am -=================================================================== ---- libluksde-20220807.orig/Makefile.am -+++ libluksde-20220807/Makefile.am -@@ -3,21 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libclocale \ -- libcnotify \ -- libcsplit \ -- libuna \ -- libcfile \ -- libcpath \ -- libbfio \ -- libfcache \ -- libfguid \ -- libhmac \ -- libcaes \ -- libfcrypto \ - libluksde \ - luksdetools \ - pyluksde \ -@@ -78,22 +63,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)/libfguid && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libhmac && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libcaes && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfcrypto && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libluksde && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libluksde-20220807/configure.ac -=================================================================== ---- libluksde-20220807.orig/configure.ac -+++ libluksde-20220807/configure.ac -@@ -175,21 +175,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([libfcache/Makefile]) --AC_CONFIG_FILES([libfguid/Makefile]) --AC_CONFIG_FILES([libhmac/Makefile]) --AC_CONFIG_FILES([libcaes/Makefile]) --AC_CONFIG_FILES([libfcrypto/Makefile]) - AC_CONFIG_FILES([libluksde/Makefile]) - AC_CONFIG_FILES([pyluksde/Makefile]) - AC_CONFIG_FILES([pyluksde-python2/Makefile])