From 4641b575c7f04c397c9d26ee90394ca300e14d8f6e3911a0d6eac331b1145bd2 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sat, 22 Jan 2022 15:49:00 +0000
Subject: [PATCH] - Update to release 20220122
OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfwps?expand=0&rev=3
---
_service | 14 --------
libfwps-20210421.tar.xz | 3 --
libfwps-alpha-20220122.tar.gz | 3 ++
libfwps-alpha-20220122.tar.gz.asc | 11 ++++++
libfwps.changes | 6 ++++
libfwps.keyring | 29 ++++++++++++++++
libfwps.spec | 57 ++++++++++++++++---------------
7 files changed, 79 insertions(+), 44 deletions(-)
delete mode 100644 _service
delete mode 100644 libfwps-20210421.tar.xz
create mode 100644 libfwps-alpha-20220122.tar.gz
create mode 100644 libfwps-alpha-20220122.tar.gz.asc
create mode 100644 libfwps.keyring
diff --git a/_service b/_service
deleted file mode 100644
index a10712f..0000000
--- a/_service
+++ /dev/null
@@ -1,14 +0,0 @@
-<services>
- <service name="tar_scm" mode="disabled">
- <param name="scm">git</param>
- <param name="url">https://github.com/libyal/libfwps</param>
- <param name="revision">5d59f5bf3ea4997da51996d3a1ab0afd37b9552d</param>
- <!-- see configure.ac -->
- <param name="versionformat">20210421</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>
diff --git a/libfwps-20210421.tar.xz b/libfwps-20210421.tar.xz
deleted file mode 100644
index 36d16e2..0000000
--- a/libfwps-20210421.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7c15462ecda93352f17a0ff2051ee84263ed7f0f8c971d5fd81f5a0e37df6fe1
-size 91456
diff --git a/libfwps-alpha-20220122.tar.gz b/libfwps-alpha-20220122.tar.gz
new file mode 100644
index 0000000..59cad2b
--- /dev/null
+++ b/libfwps-alpha-20220122.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0af69af29846f340ec3e189292ecf47cbe4df88570525cfa692c4eb130e6cb3a
+size 1267545
diff --git a/libfwps-alpha-20220122.tar.gz.asc b/libfwps-alpha-20220122.tar.gz.asc
new file mode 100644
index 0000000..83bb554
--- /dev/null
+++ b/libfwps-alpha-20220122.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmHruEoACgkQ2WJeXXrQ
+F34jfgf+LdTpLUJGneNPF+wGlPjmaS3ucfWHadf//BreZ94rZTe3wkX7XvMo3Y/0
+8/9Vw1hX8bTliEbdh/XSm5PPxN3Jn6LnzfXhvzsn0QbAMM7T/H5OTy/7st5EdPnJ
+8ZqfM70FvzRq4CuBHHkQc7aAkJc3y4lW4B6s5iDV6J2vifRf1I4wlAo3uJjp2xaP
+vW8aj4gn6HaKeLGKXH1l3+ZcBv61TU+X95PzUfa6eAAFUjBmojjLQaL065HmTlfj
+GzUYdSPgjdWTIF/OqvUXMRCKJiQlFvYJFrsR+d0vXrdf0A8ScWKr3v6ilL5AcIlx
+tuz0y7PSUCjJmi0LQT6jBikCTYAG+Q==
+=htBP
+-----END PGP SIGNATURE-----
diff --git a/libfwps.changes b/libfwps.changes
index 844b43d..3f3b649 100644
--- a/libfwps.changes
+++ b/libfwps.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jan 22 12:35:34 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 20220122
+ * No changelog was provided
+
-------------------------------------------------------------------
Thu May 13 11:43:43 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
diff --git a/libfwps.keyring b/libfwps.keyring
new file mode 100644
index 0000000..da327a1
--- /dev/null
+++ b/libfwps.keyring
@@ -0,0 +1,29 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFSf2CoBCADJOuDavJeI0IhBPnIYol/ZfE2bXvmRJMGPasU1H6CJagTkc/Iq
+SuUpiix7HcYgyGY7qHO7B1Wpnh5plc03dFW2ysTnOk8NzSqWF/gbWIYbRg8GUATg
+fGy7NoIio/hbBlWkM0rPQq7AIK79m0m2U4ZAuQPamAC4y8H9j/SyTFI1gQNeExZ+
+L8DE3QjSx4GAVgb4cfdQQPwGmoOIgKSudZN6oPiOj+MM3yh1vv49C45ChSWNWGjB
+683zFbjuS0A483MFPI8iQGC8JecmQGvpzcOoSLkyTjT7vleFYGkfj8N0FB5Bq2L5
+TT2w9lQKEjvWTe//G4tXgnGXy8PwqRZmj2CfABEBAAG0JUpvYWNoaW0gTWV0eiA8
+am9hY2hpbS5tZXR6QGdtYWlsLmNvbT6JATkEEwECACMFAlSf2CoCGwMHCwkIBwMC
+AQYVCAIJCgsEFgIDAQIeAQIXgAAKCRDZYl5detAXfkBgCAC4W/adqlNYSkK5VDoU
+FDMMRDffVVe0WdPlW7PDJXR0R0IParwHD+FJY3jtNA2upqKTCXm7JbQRN/n4Qrfb
+PJHr0EoBF7iG6kT4RKocImciuMJaj4fTolGNdc0iRKl5tMIb64RiE47XhN7v6/oP
+UaqrbnF5EW9EZ2AqOSTEcLeTgKLErMlv2dLjFXg8jXGNxTkmi6BELyaczgWBgD9I
+3tfMvXLswI5q9RtpJUc8oAfV81ibfFm6UeItQxM6SM0WLKILlXIQqqiQ4oCbAm4R
+PJI4RwoJYAhcJOmUXrAUC5obhjkf9Qo0RJzVMFLuQXDiRV5W5dBL/hs9M0FVWDxv
+siZNuQENBFSf2CoBCADODF+4Q3nXhmvTpVZTh17gYzCQqOHKctyTwoWg0VidmWWD
+lmtDBX8hWh1fjm0KQezzYagddgjlPncgq/oyrhvq2fEG3nch5qpb8k94v6KlhC9+
+SoJAwFoMLfCG8lQXASHKFvt3LJKJhS3laOLzzc4QNhWG7KRrwiOcp47bjoL8x+9L
+U1EkGZR1OMGWYaJmokEcPTNchLEgL7MMRtdaPmh9R2f8N7eqb/mKNZCxyt89a3yw
+uapLtYe5dRPEnpL00PXd9uMlwMbyuMcP60CouMFGqqKeBITWTd8vPsz+CpictNZw
+Toa25CCGgoGm2pP5catMdjH3SDZef5Mkqq5uZT/pABEBAAGJAR8EGAECAAkFAlSf
+2CoCGwwACgkQ2WJeXXrQF34oPQf6AyuzFs60DKrldW8tKPZxSmrQoOEK5h+w1WUQ
+RTvJyE5CECzocC68s46jGkluMa4wHzBDGYH2CoWAqXpnEC4UivBtlZses92vdqtM
+5kqWrSkamTwsggtVyqHvHUW+OSiJLluGA1amn1sVaQUAIP9PEk/q7Qj9VzctKGA5
+3UVw6NA/sYad+IIg95qu798GF4nrtyY9nhQg9YM/6C2CF6FpJJUlNMPXm9zx20dL
+cuAm/5zwU7xoNbV8c829EiqrRCdJMY8/LPriF7fDxUQa3AAptFZoWWkt4T5QbjB4
+VpPayIneEZRdCFktpSPgVYLm8HboNXeladSTdOtJS0HaoPzMTg==
+=fRjn
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/libfwps.spec b/libfwps.spec
index 16e2a75..338ebee 100644
--- a/libfwps.spec
+++ b/libfwps.spec
@@ -1,7 +1,7 @@
#
# spec file for package libfwps
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,28 +18,32 @@
Name: libfwps
%define lname libfwps1
-Version: 20210421
+Version: 20220122
Release: 0
Summary: Library for Windows Property Store data types
License: LGPL-3.0-or-later
Group: Development/Libraries/C and C++
URL: https://github.com/libyal/libfwps
-Source: %name-%version.tar.xz
+Source: https://github.com/libyal/libfwps/releases/download/%version/libfwps-alpha-%version.tar.gz
+Source2: https://github.com/libyal/libfwps/releases/download/%version/libfwps-alpha-%version.tar.gz.asc
+Source9: %name.keyring
Patch1: system-libs.patch
+BuildRequires: %{python_module devel}
BuildRequires: c_compiler
BuildRequires: gettext-tools >= 0.18.1
BuildRequires: libtool
BuildRequires: pkg-config
-BuildRequires: pkgconfig(libcdata) >= 20200509
-BuildRequires: pkgconfig(libcerror) >= 20201121
-BuildRequires: pkgconfig(libclocale) >= 20200913
-BuildRequires: pkgconfig(libcnotify) >= 20200913
-BuildRequires: pkgconfig(libcthreads) >= 20200508
-BuildRequires: pkgconfig(libfdatetime) >= 20180910
-BuildRequires: pkgconfig(libfguid) >= 20180724
-BuildRequires: pkgconfig(libfole) >= 20170502
-BuildRequires: pkgconfig(libuna) >= 20201204
-BuildRequires: pkgconfig(python3)
+BuildRequires: python-rpm-macros
+BuildRequires: pkgconfig(libcdata) >= 20220115
+BuildRequires: pkgconfig(libcerror) >= 20220101
+BuildRequires: pkgconfig(libclocale) >= 20220107
+BuildRequires: pkgconfig(libcnotify) >= 20220108
+BuildRequires: pkgconfig(libcthreads) >= 20220102
+BuildRequires: pkgconfig(libfdatetime) >= 20220112
+BuildRequires: pkgconfig(libfguid) >= 20220113
+BuildRequires: pkgconfig(libfole) >= 20220115
+BuildRequires: pkgconfig(libuna) >= 20220102
+%python_subpackages
%description
libfwps is a library for Windows Property Store data types.
@@ -66,24 +70,23 @@ libfwps is a library for Windows Property Store data types.
This subpackage contains libraries and header files for developing
applications that want to make use of libfwps.
-%package -n python3-%{name}
-Summary: Python 3 bindings for libfwps
-License: LGPL-3.0-or-later
-Group: Development/Languages/Python
-
-%description -n python3-%{name}
-Python 3 bindings for libfwps, which can read Windows Property Store data types.
-
%prep
%autosetup -p1
%build
-if [ ! -e configure ]; then ./autogen.sh; fi
-%configure --disable-static --enable-python3
+autoreconf -fi
+# OOT builds are presently broken, so we have to install
+# within each python iteration now, not in %%install.
+%{python_expand #
+%configure --disable-static \
+ --enable-python PYTHON_VERSION="%{$python_bin_suffix}"
%make_build
+%make_install DESTDIR="%_builddir/rt"
+%make_build clean
+}
%install
-%make_install
+mv %_builddir/rt/* %buildroot/
find "%buildroot" -type f -name "*.la" -delete -print
%post -n %lname -p /sbin/ldconfig
@@ -93,13 +96,13 @@ find "%buildroot" -type f -name "*.la" -delete -print
%license COPYING*
%_libdir/libfwps.so.*
-%files devel
+%files -n %name-devel
%_includedir/*
%_libdir/*.so
%_libdir/pkgconfig/*.pc
%_mandir/man3/*.3*
-%files -n python3-%name
-%python3_sitearch/*.so
+%files %python_files
+%python_sitearch/*.so
%changelog