From e6fcef5fca1f7ce3cf843e981f0aeacb955ca9655a39dfd87d6e2570a59f16db Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 22 Jan 2022 22:18:56 +0000 Subject: [PATCH 1/2] - Enable multipython builds. OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfsntfs?expand=0&rev=30 --- libfsntfs.changes | 5 +++++ libfsntfs.spec | 33 +++++++++++++++++---------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/libfsntfs.changes b/libfsntfs.changes index e482576..c41b466 100644 --- a/libfsntfs.changes +++ b/libfsntfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jan 22 21:58:27 UTC 2022 - Jan Engelhardt + +- Enable multipython builds. + ------------------------------------------------------------------- Wed Dec 29 10:20:20 UTC 2021 - Jan Engelhardt diff --git a/libfsntfs.spec b/libfsntfs.spec index 81fa75e..c5c6f8b 100644 --- a/libfsntfs.spec +++ b/libfsntfs.spec @@ -1,7 +1,7 @@ # # spec file for package libfsntfs # -# 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 @@ -28,10 +28,12 @@ Source: https://github.com/libyal/libfsntfs/releases/download/%version/l Source2: https://github.com/libyal/libfsntfs/releases/download/%version/libfsntfs-experimental-%version.tar.gz.asc Source3: %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: python-rpm-macros BuildRequires: pkgconfig(fuse) >= 2.6 BuildRequires: pkgconfig(libbfio) >= 20201229 BuildRequires: pkgconfig(libcdata) >= 20210625 @@ -50,7 +52,7 @@ BuildRequires: pkgconfig(libfusn) >= 20180726 BuildRequires: pkgconfig(libfwnt) >= 20210906 BuildRequires: pkgconfig(libhmac) >= 20200104 BuildRequires: pkgconfig(libuna) >= 20210801 -BuildRequires: pkgconfig(python3) +%python_subpackages %description Library and tools to access the New Technology File System (NTFS). @@ -89,24 +91,23 @@ Requires: %{lname} = %{version} This subpackage contains libraries and header files for developing applications that want to make use of %{name}. -%package -n python3-%{name} -Summary: Python 3 bindings for libfsntfs -License: LGPL-3.0-or-later -Group: Development/Languages/Python - -%description -n python3-%{name} -Python 3 binding for libfsntfs, which can access the NTFS filesystem. - %prep %autosetup -p1 %build autoreconf -fi -%configure --disable-static --enable-wide-character-type --enable-python3 +# OOT builds are presently broken, so we have to install +# within each python iteration now, not in %%install. +%{python_expand # +%configure --disable-static --enable-wide-character-type \ + --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 @@ -116,19 +117,19 @@ find %{buildroot} -type f -name "*.la" -delete -print %license COPYING* %{_libdir}/libfsntfs.so.* -%files tools +%files -n %name-tools %{_bindir}/fsntfs* %{_mandir}/man1/fsntfsinfo.1* -%files devel +%files -n %name-devel %{_includedir}/libfsntfs.h %{_includedir}/libfsntfs/ %{_libdir}/libfsntfs.so %{_libdir}/pkgconfig/libfsntfs.pc %{_mandir}/man3/libfsntfs.3* -%files -n python3-%{name} +%files %python_files %license COPYING* -%{python3_sitearch}/pyfsntfs.so +%{python_sitearch}/pyfsntfs.so %changelog From 0fc31b1e74e11091c7d196ea5f8d876c7fc170dc7d22b8154ca77cc71fb7e5fb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 20 Feb 2022 14:25:04 +0000 Subject: [PATCH 2/2] - Update to release 20220220 OBS-URL: https://build.opensuse.org/package/show/security:forensics/libfsntfs?expand=0&rev=31 --- libfsntfs-experimental-20211229.tar.gz | 3 --- libfsntfs-experimental-20211229.tar.gz.asc | 11 --------- libfsntfs-experimental-20220220.tar.gz | 3 +++ libfsntfs-experimental-20220220.tar.gz.asc | 11 +++++++++ libfsntfs.changes | 6 +++++ libfsntfs.spec | 28 +++++++++++----------- 6 files changed, 34 insertions(+), 28 deletions(-) delete mode 100644 libfsntfs-experimental-20211229.tar.gz delete mode 100644 libfsntfs-experimental-20211229.tar.gz.asc create mode 100644 libfsntfs-experimental-20220220.tar.gz create mode 100644 libfsntfs-experimental-20220220.tar.gz.asc diff --git a/libfsntfs-experimental-20211229.tar.gz b/libfsntfs-experimental-20211229.tar.gz deleted file mode 100644 index 8618fd6..0000000 --- a/libfsntfs-experimental-20211229.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7cdb286d1885b87378d4dc48a1d4182bc30c2d12de650944e9b9e919048017ca -size 2085219 diff --git a/libfsntfs-experimental-20211229.tar.gz.asc b/libfsntfs-experimental-20211229.tar.gz.asc deleted file mode 100644 index 8ea2a1c..0000000 --- a/libfsntfs-experimental-20211229.tar.gz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmHMHRoACgkQ2WJeXXrQ -F36K9Af/c1sTTDKixrD/47ffKUSRfdgcmGFWF1WDKgcqvD91YCEPPDLkrRS/PLkm -V+M3JE3q/OaGUtsR80NY9yGszF4NFnzIWGWI/plCbHQUW2BHAz0AB6oWQEWIuaMQ -oEhM6oivwcfbBWXse+XahI0ykayvnC1RCWHM59oVwvucmfMniwQn32DFKy5upTnS -4nts51TxPQahCBmxwNpRn3Ws7uQcrzgH7FSdOc1ygJH5JMtGS3IWjGr3lUvRekIw -eEnxyYR8mgGwMkmpsBL6duzf2tRKZg2eMBuiD4Bpeoa3RnYLIQKviTr7VP1hjYP4 -h6yHi72gcBHDxT+K4MAdcgG2NqFNsw== -=5ik4 ------END PGP SIGNATURE----- diff --git a/libfsntfs-experimental-20220220.tar.gz b/libfsntfs-experimental-20220220.tar.gz new file mode 100644 index 0000000..7b69802 --- /dev/null +++ b/libfsntfs-experimental-20220220.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e404b66bee121a8b26b5cc80dd5d089633c6fc90f4651c1bb557851211b84794 +size 2109754 diff --git a/libfsntfs-experimental-20220220.tar.gz.asc b/libfsntfs-experimental-20220220.tar.gz.asc new file mode 100644 index 0000000..3784d43 --- /dev/null +++ b/libfsntfs-experimental-20220220.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEDtkCDakNP25wvTlF2WJeXXrQF34FAmISQC8ACgkQ2WJeXXrQ +F342Fwf+PFVQSFCYJ9OSnwtm1ORNWBbvQzLgRNdUlcbBvAiHTXilJ+uYIIZz23DM +G5BwGpJTQ/moeysSFlhXqIRULFuDmjDXb1lKSxeIKwxrfeYujgO524FNiPueiHKd +pUy2NUDpie85SCxm9lUUIRornZ/X4+49uN3bM4z+Y48nnB939aknfOoIi+JueaLJ +SPj20Wrx4iA4hG79ae0dWlvdKJBqzP+FeUnvHU+uc3CMab73ynMchatYkSjwBmNe +kRyz0hVl/sNy9fpLjTLHsJKLGGvSmxwUrZ5YzdY1v7L0xXZj9DMO2Ix3xu3LDCZF +JHj7zQt9MQ3xmzUcinyU/lMH6ZhMVQ== +=Thbg +-----END PGP SIGNATURE----- diff --git a/libfsntfs.changes b/libfsntfs.changes index c41b466..e3b63a8 100644 --- a/libfsntfs.changes +++ b/libfsntfs.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Feb 20 14:20:27 UTC 2022 - Jan Engelhardt + +- Update to release 20220220 + * No changelog available. + ------------------------------------------------------------------- Sat Jan 22 21:58:27 UTC 2022 - Jan Engelhardt diff --git a/libfsntfs.spec b/libfsntfs.spec index c5c6f8b..aedd8c4 100644 --- a/libfsntfs.spec +++ b/libfsntfs.spec @@ -18,7 +18,7 @@ %define lname libfsntfs1 Name: libfsntfs -Version: 20211229 +Version: 20220220 Release: 0 Summary: Library and tools to access the NTFS filesystem License: GFDL-1.3-or-later AND LGPL-3.0-or-later @@ -35,23 +35,23 @@ BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python-rpm-macros BuildRequires: pkgconfig(fuse) >= 2.6 -BuildRequires: pkgconfig(libbfio) >= 20201229 -BuildRequires: pkgconfig(libcdata) >= 20210625 -BuildRequires: pkgconfig(libcerror) >= 20201121 +BuildRequires: pkgconfig(libbfio) >= 20220120 +BuildRequires: pkgconfig(libcdata) >= 20220115 +BuildRequires: pkgconfig(libcerror) >= 20220101 BuildRequires: pkgconfig(libcfile) >= 20201229 -BuildRequires: pkgconfig(libclocale) >= 20210526 -BuildRequires: pkgconfig(libcnotify) >= 20200913 -BuildRequires: pkgconfig(libcpath) >= 20200623 -BuildRequires: pkgconfig(libcsplit) >= 20200703 -BuildRequires: pkgconfig(libcthreads) >= 20211115 -BuildRequires: pkgconfig(libfcache) >= 20200708 +BuildRequires: pkgconfig(libclocale) >= 20220107 +BuildRequires: pkgconfig(libcnotify) >= 20220108 +BuildRequires: pkgconfig(libcpath) >= 20220108 +BuildRequires: pkgconfig(libcsplit) >= 20220109 +BuildRequires: pkgconfig(libcthreads) >= 20220102 +BuildRequires: pkgconfig(libfcache) >= 20220110 BuildRequires: pkgconfig(libfdata) >= 20211023 -BuildRequires: pkgconfig(libfdatetime) >= 20180910 -BuildRequires: pkgconfig(libfguid) >= 20180724 -BuildRequires: pkgconfig(libfusn) >= 20180726 +BuildRequires: pkgconfig(libfdatetime) >= 20220112 +BuildRequires: pkgconfig(libfguid) >= 20220113 +BuildRequires: pkgconfig(libfusn) >= 20220119 BuildRequires: pkgconfig(libfwnt) >= 20210906 BuildRequires: pkgconfig(libhmac) >= 20200104 -BuildRequires: pkgconfig(libuna) >= 20210801 +BuildRequires: pkgconfig(libuna) >= 20220102 %python_subpackages %description