diff --git a/libwrc.changes b/libwrc.changes index af6c8bc..986c2c7 100644 --- a/libwrc.changes +++ b/libwrc.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) + ------------------------------------------------------------------- Fri Nov 4 10:04:38 UTC 2022 - Jan Engelhardt diff --git a/libwrc.spec b/libwrc.spec index 994e299..ab9acb5 100644 --- a/libwrc.spec +++ b/libwrc.spec @@ -27,11 +27,8 @@ URL: https://github.com/libyal/libwrc Source: https://github.com/libyal/libwrc/releases/download/%version/libwrc-experimental-%version.tar.gz Source2: https://github.com/libyal/libwrc/releases/download/%version/libwrc-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) >= 20221025 @@ -53,6 +50,7 @@ BuildRequires: pkgconfig(libfwnt) >= 20220922 BuildRequires: pkgconfig(libuna) >= 20220611 BuildRequires: pkgconfig(python3) %python_subpackages +# Various notes: https://en.opensuse.org/libyal %description libwrc is a library to support the Windows Resource Compiler format. @@ -87,15 +85,12 @@ reading Windows Resource Compiler files. %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 4081ce9..0000000 --- a/system-libs.patch +++ /dev/null @@ -1,94 +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 | 32 -------------------------------- - configure.ac | 17 ----------------- - 2 files changed, 49 deletions(-) - -Index: libwrc-20220720/Makefile.am -=================================================================== ---- libwrc-20220720.orig/Makefile.am -+++ libwrc-20220720/Makefile.am -@@ -3,24 +3,7 @@ ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = \ - include \ - common \ -- libcerror \ -- libcthreads \ -- libcdata \ -- libclocale \ -- libcnotify \ -- libcsplit \ -- libuna \ -- libcfile \ -- libcpath \ -- libbfio \ -- libfcache \ -- libfdata \ -- libfdatetime \ -- libfguid \ -- libfvalue \ -- libfwnt \ - libwrc \ -- libexe \ - wrctools \ - pywrc \ - pywrc-python2 \ -@@ -80,21 +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)/libfdata && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) -- (cd $(srcdir)/libfwnt && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/libwrc && $(MAKE) $(AM_MAKEFLAGS)) - (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) - -Index: libwrc-20220720/configure.ac -=================================================================== ---- libwrc-20220720.orig/configure.ac -+++ libwrc-20220720/configure.ac -@@ -178,27 +178,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([libfwnt/Makefile]) - AC_CONFIG_FILES([libwrc/Makefile]) - AC_CONFIG_FILES([pywrc/Makefile]) - AC_CONFIG_FILES([pywrc-python2/Makefile]) - AC_CONFIG_FILES([pywrc-python3/Makefile]) --AC_CONFIG_FILES([libexe/Makefile]) - AC_CONFIG_FILES([wrctools/Makefile]) - AC_CONFIG_FILES([po/Makefile.in]) - AC_CONFIG_FILES([po/Makevars])