diff --git a/_service b/_service new file mode 100644 index 0000000..7c32924 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libwrc + 89146ffcdf24d904602dfdc6cfe3b0e54f639299 + + 20210425 + + + *.tar + xz + + + diff --git a/libwrc-20210425.tar.xz b/libwrc-20210425.tar.xz new file mode 100644 index 0000000..33ea844 --- /dev/null +++ b/libwrc-20210425.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:15b6b4f1004b771dd19308330a8fedfbb411f8b5bf0dbdd259add150702ca4a3 +size 143548 diff --git a/libwrc-experimental-20191221.tar.gz b/libwrc-experimental-20191221.tar.gz deleted file mode 100644 index 1d8d3d4..0000000 --- a/libwrc-experimental-20191221.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ba7421fbe106a53b59a6fb413f81941da87ea6749a0bae1d5680a6196b7aab79 -size 1765088 diff --git a/libwrc.changes b/libwrc.changes index 5e4a8f1..b1d6079 100644 --- a/libwrc.changes +++ b/libwrc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 13 12:06:54 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210425 (89146ffc) + * No changelog was provided +- Add system-libs.patch +- Enable python3 integration + ------------------------------------------------------------------- Wed Dec 30 03:30:33 UTC 2020 - Greg Freemyer diff --git a/libwrc.spec b/libwrc.spec index 58d12b1..8ea0822 100644 --- a/libwrc.spec +++ b/libwrc.spec @@ -1,7 +1,7 @@ # # spec file for package libwrc # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,36 +18,37 @@ Name: libwrc %define lname libwrc1 -%define timestamp 20191221 -Version: 0~%timestamp +Version: 20210425 Release: 0 Summary: Library to support the Windows Resource Compiler format License: LGPL-3.0-or-later Group: Productivity/File utilities -URL: https://github.com/libyal/libwrc/wiki -Source: https://github.com/libyal/libwrc/releases/download/%timestamp/%name-experimental-%timestamp.tar.gz -#BuildRequires: pkg-config -BuildRequires: pkgconfig(libbfio) >= 20120426 -BuildRequires: pkgconfig(libcdata) >= 20120425 -BuildRequires: pkgconfig(libcfile) >= 20120526 -BuildRequires: pkgconfig(libclocale) >= 20130609 -BuildRequires: pkgconfig(libcnotify) >= 20120425 -BuildRequires: pkgconfig(libcpath) >= 20130609 -BuildRequires: pkgconfig(libcsplit) >= 20130904 -BuildRequires: pkgconfig(libexe) >= 20120405 -BuildRequires: pkgconfig(libfcache) >= 20120405 -BuildRequires: pkgconfig(libfdata) >= 20120405 -BuildRequires: pkgconfig(libfdatetime) >= 20130317 -BuildRequires: pkgconfig(libfguid) >= 20130317 -BuildRequires: pkgconfig(libfvalue) >= 20120428 -BuildRequires: pkgconfig(libfwevt) >= 20120426 -BuildRequires: pkgconfig(libfwnt) >= 20120426 -BuildRequires: pkgconfig(libuna) >= 20130728 -# The following packages cause build failures if factory version is used, -# verified 1/12/2015 -#BuildRequires: pkgconfig(libcerror) >= 20120425 -#BuildRequires: pkgconfig(libcstring) >= 20120425 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +URL: https://github.com/libyal/libwrc +Source: %name-%version.tar.xz +Patch1: system-libs.patch +BuildRequires: c_compiler +BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: libtool +BuildRequires: pkg-config +BuildRequires: pkgconfig(libbfio) >= 20201229 +BuildRequires: pkgconfig(libcdata) >= 20200509 +BuildRequires: pkgconfig(libcerror) >= 20201121 +BuildRequires: pkgconfig(libcfile) >= 20201229 +BuildRequires: pkgconfig(libclocale) >= 20200913 +BuildRequires: pkgconfig(libcnotify) >= 20200913 +BuildRequires: pkgconfig(libcpath) >= 20200623 +BuildRequires: pkgconfig(libcsplit) >= 20200703 +BuildRequires: pkgconfig(libcthreads) >= 20200508 +BuildRequires: pkgconfig(libexe) >= 20210424 +BuildRequires: pkgconfig(libfcache) >= 20200708 +BuildRequires: pkgconfig(libfdata) >= 20201129 +BuildRequires: pkgconfig(libfdatetime) >= 20180910 +BuildRequires: pkgconfig(libfguid) >= 20180724 +BuildRequires: pkgconfig(libfvalue) >= 20210510 +BuildRequires: pkgconfig(libfwevt) >= 20210508 +BuildRequires: pkgconfig(libfwnt) >= 20210421 +BuildRequires: pkgconfig(libuna) >= 20201204 +BuildRequires: pkgconfig(python3) %description libwrc is a library to support the Windows Resource Compiler format. @@ -78,36 +79,43 @@ Group: Productivity/File utilities This subpackage provides the utilities from libwrc, which allows for reading Windows Resource Compiler files. +%package -n python3-%name +Summary: Python 3 bindings for libwrc +Group: Development/Languages/Python + +%description -n python3-%name +Python 3 bindings for libwrc + %prep -%setup -qn libwrc-%timestamp +%autosetup -p1 %build -%configure --disable-static --enable-wide-character-type -make %{?_smp_mflags} +if [ ! -e configure ]; then ./autogen.sh; fi +%configure --disable-static --enable-wide-character-type --enable-python3 +%make_build %install -make install DESTDIR="%buildroot" -rm -f "%buildroot/%_libdir"/*.la +%make_install +find "%buildroot/%_libdir" -type f -name "*.la" -delete %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig %files -n %lname -%defattr(-,root,root) -%doc AUTHORS ChangeLog %license COPYING* %_libdir/libwrc.so.1* %files devel -%defattr(-,root,root) %_includedir/libwrc* %_libdir/libwrc.so %_libdir/pkgconfig/libwrc.pc %_mandir/man3/libwrc.3* %files tools -%defattr(-,root,root) %_bindir/wrcinfo %_mandir/man1/wrcinfo.1* +%files -n python3-%name +%python3_sitearch/*.so + %changelog diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..8700d98 --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,97 @@ +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 | 34 ---------------------------------- + configure.ac | 18 ------------------ + 2 files changed, 52 deletions(-) + +Index: libwrc/Makefile.am +=================================================================== +--- libwrc.orig/Makefile.am ++++ libwrc/Makefile.am +@@ -3,25 +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 \ + libwrc \ +- libexe \ + wrctools \ + pywrc \ + pywrc-python2 \ +@@ -82,22 +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)/libfcache && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfwevt && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libfwnt && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/libwrc && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libwrc/configure.ac +=================================================================== +--- libwrc.orig/configure.ac ++++ libwrc/configure.ac +@@ -182,28 +182,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([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])