Accepting request 898697 from home:jengelh:forensics

- Update to snapshot 20210419 (4142a726)

OBS-URL: https://build.opensuse.org/request/show/898697
OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfwsi?expand=0&rev=17

_service

@@ -0,0 +1,14 @@
+<services>
+	<service name="tar_scm" mode="disabled">
+		<param name="scm">git</param>
+		<param name="url">https://github.com/libyal/libfwsi</param>
+		<param name="revision">4142a726b75f643d7b446d93a4c250bc22023a6a</param>
+		<!-- see configure.ac -->
+		<param name="versionformat">20210419</param>
+	</service>
+	<service name="recompress" mode="disabled">
+		<param name="file">*.tar</param>
+		<param name="compression">xz</param>
+	</service>
+	<service name="set_version" mode="disabled"/>
+</services>

libfwsi-20210419.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87447623d5c4b75ca2670c5ffff9f3bf2e22dd687b56173a9de37a2a70429ecc
+size 163108

libfwsi-experimental-20201204.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:30a1f5217e94e941e1c70961463782fb68788a2389b1b5ffabd379a7fed9faf2
-size 1361862

libfwsi.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu May 13 11:38:39 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to snapshot 20210419 (4142a726)
+  * No changelog was provided
+- Add system-libs.patch
+
 -------------------------------------------------------------------
 Tue Dec 29 23:05:03 UTC 2020 - Greg Freemyer <Greg.Freemyer@gmail.com>
 

libfwsi.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libfwsi
 #
-# 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
@@ -17,30 +17,31 @@
 
 
 %define lname	libfwsi1
-%define timestamp 20201204
 Name:           libfwsi
-Version:        0~%{timestamp}
+Version:        20210419
 Release:        0
 Summary:        Library to access the Windows Shell Item format
-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/libfwsi/wiki
+URL:            https://github.com/libyal/libfwsi
-Source:         https://github.com/libyal/libfwsi/releases/download/%timestamp/%name-experimental-%timestamp.tar.gz
+Source:         %name-%version.tar.xz
 Source2:        Windows_Shell_Item_format.pdf
+Patch1:         system-libs.patch
+BuildRequires:  c_compiler
+BuildRequires:  gettext-tools >= 0.18.1
+BuildRequires:  libtool
 BuildRequires:  pkg-config
-BuildRequires:  pkgconfig(libcdata) >= 20140105
+BuildRequires:  pkgconfig(libcdata) >= 20200509
-BuildRequires:  pkgconfig(libcerror) >= 20140105
+BuildRequires:  pkgconfig(libcerror) >= 20201121
-BuildRequires:  pkgconfig(libclocale)
+BuildRequires:  pkgconfig(libclocale) >= 20200913
-BuildRequires:  pkgconfig(libcnotify)
+BuildRequires:  pkgconfig(libcnotify) >= 20200913
-BuildRequires:  pkgconfig(libcstring) >= 20150101
+BuildRequires:  pkgconfig(libcthreads) >= 20200508
-BuildRequires:  pkgconfig(libcthreads) >= 20130723
+BuildRequires:  pkgconfig(libfdatetime) >= 20180910
-BuildRequires:  pkgconfig(libfdatetime)
+BuildRequires:  pkgconfig(libfguid) >= 20180724
-BuildRequires:  pkgconfig(libfguid)
+BuildRequires:  pkgconfig(libfole) >= 20170502
-BuildRequires:  pkgconfig(libfole)
+BuildRequires:  pkgconfig(libfwps) >= 20191221
-BuildRequires:  pkgconfig(libuna)
+BuildRequires:  pkgconfig(libuna) >= 20201204
-# not (yet) packaged in OBS
+BuildRequires:  pkgconfig(python3)
-#BuildRequires:  pkgconfig(libfwps)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Library to access the Windows Shell Item format for the libyal family of libraries.
@@ -57,7 +58,7 @@ libyal is typically used in digital forensic tools.
 
 %package devel
 Summary:        Development files for libfwsi
-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}
 
@@ -83,37 +84,31 @@ Python2 bindings for libfwsi, a library to access Windows Shell Items.
 Summary:        Python bindings for libfwsi
 License:        LGPL-3.0-or-later
 Group:          Development/Libraries/Python
-Requires:       %{lname} = %{version}
-BuildRequires:  pkgconfig(python3)
 
 %description -n python3-%name
 Python3 bindings for libfwsi, a library to access Windows Shell Items.
 
 %prep
-%setup -q -n libfwsi-%{timestamp}
+%autosetup -p1
 cp "%{S:2}" .
 
 %build
-%configure --disable-static --enable-wide-character-type --enable-python2 --enable-python3 
+if [ ! -e configure ]; then ./autogen.sh; fi
-make %{?_smp_mflags}
+%configure --disable-static --enable-python2 --enable-python3
+%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 ChangeLog
 %license COPYING*
 %{_libdir}/libfwsi.so.*
 
 %files devel
-%defattr(-,root,root)
-%doc AUTHORS README ChangeLog
 %license COPYING*
 %doc Windows_Shell_Item_format.pdf
 %{_includedir}/libfwsi.h
@@ -123,14 +118,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_mandir}/man3/libfwsi.3*
 
 %files -n python2-%name
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog
 %license COPYING*
 %python2_sitearch/pyfwsi.so
 
 %files -n python3-%name
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog
 %license COPYING*
 %python3_sitearch/pyfwsi.so
 

system-libs.patch

@@ -0,0 +1,70 @@
+From: Jan Engelhardt <jengelh@inai.de>
+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  |   20 --------------------
+ configure.ac |   10 ----------
+ 2 files changed, 30 deletions(-)
+
+Index: libfwsi/Makefile.am
+===================================================================
+--- libfwsi.orig/Makefile.am
++++ libfwsi/Makefile.am
+@@ -3,16 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = \
+ 	include \
+ 	common \
+-	libcerror \
+-	libcthreads \
+-	libcdata \
+-	libclocale \
+-	libcnotify \
+-	libuna \
+-	libfdatetime \
+-	libfguid \
+-	libfole \
+-	libfwps \
+ 	libfwsi \
+ 	pyfwsi \
+ 	pyfwsi-python2 \
+@@ -72,16 +62,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)/libuna && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libfdatetime && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libfguid && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libfole && $(MAKE) $(AM_MAKEFLAGS))
+-	(cd $(srcdir)/libfwps && $(MAKE) $(AM_MAKEFLAGS))
+ 	(cd $(srcdir)/libfwsi && $(MAKE) $(AM_MAKEFLAGS))
+ 	(cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
+ 
+Index: libfwsi/configure.ac
+===================================================================
+--- libfwsi.orig/configure.ac
++++ libfwsi/configure.ac
+@@ -142,16 +142,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([libuna/Makefile])
+-AC_CONFIG_FILES([libfdatetime/Makefile])
+-AC_CONFIG_FILES([libfguid/Makefile])
+-AC_CONFIG_FILES([libfole/Makefile])
+-AC_CONFIG_FILES([libfwps/Makefile])
+ AC_CONFIG_FILES([libfwsi/Makefile])
+ AC_CONFIG_FILES([pyfwsi/Makefile])
+ AC_CONFIG_FILES([pyfwsi-python2/Makefile])