From 8c79e3a52e2ae4e2365a946897e4c4a7402abb272d1cb9199c3df68602370fc9 Mon Sep 17 00:00:00 2001 From: Greg Freemyer Date: Wed, 9 Jun 2021 09:37:50 +0000 Subject: [PATCH] Accepting request 898678 from home:jengelh:forensics - Update to snapshot 20210415 (bd3f3608) OBS-URL: https://build.opensuse.org/request/show/898678 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfole?expand=0&rev=6 --- _service | 14 ++++++++++++ libfole-20210415.tar.xz | 3 +++ libfole-alpha-20170502.tar.gz | 3 --- libfole.changes | 7 ++++++ libfole.spec | 37 ++++++++++++++---------------- system-libs.patch | 43 +++++++++++++++++++++++++++++++++++ 6 files changed, 84 insertions(+), 23 deletions(-) create mode 100644 _service create mode 100644 libfole-20210415.tar.xz delete mode 100644 libfole-alpha-20170502.tar.gz create mode 100644 system-libs.patch diff --git a/_service b/_service new file mode 100644 index 0000000..03978fa --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + git + https://github.com/libyal/libfole + bd3f3608503dcbaacfb555d48c7f3b81c0e5aaa5 + + 20210415 + + + *.tar + xz + + + diff --git a/libfole-20210415.tar.xz b/libfole-20210415.tar.xz new file mode 100644 index 0000000..2c408b1 --- /dev/null +++ b/libfole-20210415.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:720caf458f105154661398cd1b44cb56d01255d5c1ba1678cb5e3b1834847c7a +size 62480 diff --git a/libfole-alpha-20170502.tar.gz b/libfole-alpha-20170502.tar.gz deleted file mode 100644 index ecdf67b..0000000 --- a/libfole-alpha-20170502.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:885d557c70423263dbf9ee27a3e160b005735f1e50bf3de67088c039ffc978b4 -size 493376 diff --git a/libfole.changes b/libfole.changes index b161722..569b575 100644 --- a/libfole.changes +++ b/libfole.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 13 11:41:22 UTC 2021 - Jan Engelhardt + +- Update to snapshot 20210415 (bd3f3608) + * No changelog was provided +- Add system-libs.patch + ------------------------------------------------------------------- Sun Oct 1 22:42:43 UTC 2017 - Greg.Freemyer@gmail.com diff --git a/libfole.spec b/libfole.spec index 1baa602..3292bf1 100644 --- a/libfole.spec +++ b/libfole.spec @@ -1,7 +1,7 @@ # # spec file for package libfole # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -12,25 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: libfole %define lname libfole1 -%define timestamp 20170502 -Version: 0~%{timestamp} +Version: 20210415 Release: 0 Summary: Library for Object Linking and Embedding (OLE) data types -License: LGPL-3.0+ +License: LGPL-3.0-or-later Group: Productivity/File utilities -Url: https://github.com/libyal/libfole/wiki -Source: https://github.com/libyal/libfole/releases/download/%timestamp/%{name}-alpha-%{timestamp}.tar.gz +URL: https://github.com/libyal/libfole +Source: %name-%version.tar.xz +Patch1: system-libs.patch +BuildRequires: c_compiler +BuildRequires: gettext-tools >= 0.18.1 +BuildRequires: libtool BuildRequires: pkg-config -BuildRequires: python-devel -BuildRequires: pkgconfig(libcerror) >= 20150101 -BuildRequires: pkgconfig(libcstring) >= 20150101 -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(libcerror) >= 20201121 %description libfole is a library for Object Linking and Embedding (OLE) data types. @@ -58,28 +58,25 @@ This subpackage contains libraries and header files for developing applications that want to make use of libfole. %prep -%setup -q -n libfole-%{timestamp} +%autosetup -p1 %build -%configure --disable-static --enable-wide-character-type --enable-python -make %{?_smp_mflags} +if [ ! -e configure ]; then ./autogen.sh; fi +%configure --disable-static +%make_build %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install find %{buildroot} -type f -name "*.la" -delete -print %post -n %{lname} -p /sbin/ldconfig - %postun -n %{lname} -p /sbin/ldconfig %files -n %{lname} -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog +%license COPYING* %{_libdir}/libfole.so.* %files devel -%defattr(-,root,root) -%doc AUTHORS COPYING README ChangeLog %{_includedir}/libfole.h %{_includedir}/libfole/ %{_libdir}/libfole.so diff --git a/system-libs.patch b/system-libs.patch new file mode 100644 index 0000000..29689a8 --- /dev/null +++ b/system-libs.patch @@ -0,0 +1,43 @@ +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 | 2 -- + configure.ac | 1 - + 2 files changed, 3 deletions(-) + +Index: libfole/Makefile.am +=================================================================== +--- libfole.orig/Makefile.am ++++ libfole/Makefile.am +@@ -3,7 +3,6 @@ ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = \ + include \ + common \ +- libcerror \ + libfole \ + po \ + manuals \ +@@ -53,7 +52,6 @@ lib: library + + library: + (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS)) +- (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/libfole && $(MAKE) $(AM_MAKEFLAGS)) + (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS)) + +Index: libfole/configure.ac +=================================================================== +--- libfole.orig/configure.ac ++++ libfole/configure.ac +@@ -97,7 +97,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([libfole/Makefile]) + AC_CONFIG_FILES([po/Makefile.in]) + AC_CONFIG_FILES([po/Makevars])