diff --git a/_service b/_service new file mode 100644 index 0000000..66e7ba7 --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libmsiecf + 9e94c3b815b2a58d0cc3065036ed0be789ad7734 + + 20210506 + + + *.tar + xz + + + diff --git a/libmsiecf-20210506.tar.xz b/libmsiecf-20210506.tar.xz new file mode 100644 index 0000000..95b07e2 --- /dev/null +++ b/libmsiecf-20210506.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:434897ccc69cb28f5f243a62663075e845ab9f050a3da11a1c7d780c47c75b3f +size 162456 diff --git a/libmsiecf-alpha-20200710.tar.gz b/libmsiecf-alpha-20200710.tar.gz deleted file mode 100644 index 1cea626..0000000 --- a/libmsiecf-alpha-20200710.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b39d2dcfdd2354eba2fb39109dab874674337d5e8337b6ac5cbc7ea280a452f -size 1529620 diff --git a/libmsiecf.changes b/libmsiecf.changes index 7b9ea88..a4a12fb 100644 --- a/libmsiecf.changes +++ b/libmsiecf.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 14 21:48:40 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210506 (9e94c3b8) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Wed Dec 30 01:21:55 UTC 2020 - Greg Freemyer diff --git a/libmsiecf.spec b/libmsiecf.spec index 7655930..4a9a4d7 100644 --- a/libmsiecf.spec +++ b/libmsiecf.spec @@ -1,7 +1,7 @@ # # spec file for package libmsiecf # -# 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,33 +18,34 @@ Name: libmsiecf %define lname libmsiecf1 -%define timestamp 20200710 -Version: 0~%timestamp +Version: 20210506 Release: 0 Summary: Library to parse MS Internet Explorer Cache Files -License: LGPL-3.0-or-later AND GFDL-1.3-or-later +License: GFDL-1.3-or-later AND LGPL-3.0-or-later Group: Productivity/File utilities -URL: https://github.com/libyal/libmsiecf/wiki -Source: https://github.com/libyal/libmsiecf/releases/download/%timestamp/%name-alpha-%timestamp.tar.gz +URL: https://github.com/libyal/libmsiecf +Source: %name-%version.tar.xz Source2: MSIE_Cache_File_index.dat_format.pdf -#BuildRequires: pkg-config -BuildRequires: pkgconfig(libbfio) >= 20120426 -BuildRequires: pkgconfig(libcdata) >= 20190112 -BuildRequires: pkgconfig(libcfile) >= 20120526 -BuildRequires: pkgconfig(libclocale) >= 20120425 -BuildRequires: pkgconfig(libcnotify) >= 20120425 -BuildRequires: pkgconfig(libcpath) >= 20120701 -BuildRequires: pkgconfig(libcsplit) >= 20120701 -BuildRequires: pkgconfig(libcsystem) >= 20150101 -BuildRequires: pkgconfig(libfdatetime) >= 20120522 -BuildRequires: pkgconfig(libfguid) >= 20120426 -BuildRequires: pkgconfig(libfole) >= 20150104 -BuildRequires: pkgconfig(libfvalue) >= 20120428 -BuildRequires: pkgconfig(libuna) >= 20120425 -# these packages fail if the factory version is used, verified 1/14/2015 -#BuildRequires: pkgconfig(libcerror) >= 20120425 -#BuildRequires: pkgconfig(libcstring) >= 20120425 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +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(libfdatetime) >= 20180910 +BuildRequires: pkgconfig(libfguid) >= 20180724 +BuildRequires: pkgconfig(libfole) >= 20170502 +BuildRequires: pkgconfig(libfvalue) >= 20210510 +BuildRequires: pkgconfig(libuna) >= 20201204 +BuildRequires: pkgconfig(python3) %description libmsiecf is a library to parse MS Internet Explorer Cache Files. @@ -64,10 +65,10 @@ Group: System/Filesystems %description tools Several tools for reading MS Internet Explorer Cache files. - + %package devel Summary: Development files for %name -License: LGPL-3.0-or-later AND GFDL-1.3-or-later +License: GFDL-1.3-or-later AND LGPL-3.0-or-later Group: Development/Libraries/C and C++ Requires: %lname = %version @@ -81,40 +82,35 @@ applications that want to make use of %name. Summary: Python bindings for libmsiecf License: LGPL-3.0-or-later Group: Development/Libraries/Python -Requires: %lname = %version -BuildRequires: pkgconfig(python3) %description -n python3-%name Python bindings for libmsiecf, which can read MS IE cache files. %prep -%setup -qn libmsiecf-%timestamp +%autosetup -p1 cp "%SOURCE2" . %build +if [ ! -e configure ]; then ./autogen.sh; fi %configure --disable-static --enable-wide-character-type --enable-python3 -make %{?_smp_mflags} +%make_build %install -make install DESTDIR="%buildroot" +%make_install find %buildroot -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/libmsiecf.so.* %files tools -%defattr(-,root,root) %_bindir/msiecf* %_mandir/man1/msiecf*.1* %files devel -%defattr(-,root,root) %doc MSIE_Cache_File*.pdf %_includedir/libmsiecf.h %_includedir/libmsiecf/ @@ -123,8 +119,6 @@ find %buildroot -name '*.la' -delete %_mandir/man3/libmsiecf.3* %files -n python3-%name -%defattr(-,root,root) -%doc AUTHORS README %license COPYING* %python3_sitearch/pymsiecf.so diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..e2711eb --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,82 @@ +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])