From e6b0257122e64741b3221a4fc49905f50c818da0 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Mon, 3 Oct 2022 16:40:02 +0200 Subject: [PATCH 1/3] Update to 1.13.6 --- wimlib.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/wimlib.spec b/wimlib.spec index 5876409..42e5670 100644 --- a/wimlib.spec +++ b/wimlib.spec @@ -1,15 +1,15 @@ Name: wimlib -Version: 1.13.5 -Release: 2%{?dist} +Version: 1.13.6 +Release: 1%{?dist} Summary: Open source Windows Imaging (WIM) library # wimlib is dual-licensed (GPLv3+/LGPLv3+) but is linked to libntfs-3g (GPLv3+), -# utilities are GPLv3+, some internal headers are CC0 -License: GPLv3+ and CC0 +# utilities are GPLv3+, some internal headers are MIT +License: GPLv3+ and MIT URL: https://wimlib.net/ Source0: %{url}/downloads/%{name}-%{version}.tar.gz -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(libcrypto) @@ -78,6 +78,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Mon Oct 03 2022 Mohamed El Morabity - 1.13.6-1 +- Update to 1.13.6 +- Update license tag (CC0 replaced by MIT) + * Sat Jul 23 2022 Fedora Release Engineering - 1.13.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From c6254ac91ae123793f3b2f42ce7227b0d7438a92 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Mon, 3 Oct 2022 17:23:15 +0200 Subject: [PATCH 2/3] Fix build + add tests --- .gitignore | 1 + sources | 2 +- wimlib.spec | 8 +++++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 44df701..4b69893 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /wimlib-1.13.3.tar.gz /wimlib-1.13.4.tar.gz /wimlib-1.13.5.tar.gz +/wimlib-1.13.6.tar.gz diff --git a/sources b/sources index 7ff5394..590d0c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wimlib-1.13.5.tar.gz) = 46c25f31cb33a648f05c5984a13fc193bf54215efd69b09e055575d979b6c319b612a1b4f0800d8168794cb8f02fdf079e4caea40e6a93304616d4b403bd827e +SHA512 (wimlib-1.13.6.tar.gz) = 5aed00af2071f433a6f7c468d0f8c52fa8e202e69f5f5234976bf2f5f4e498a2bb30840c81287c445fa77ce5d8b91550a67b1c1959f7a0bcd3229a0c44fa0096 diff --git a/wimlib.spec b/wimlib.spec index 42e5670..cf7be77 100644 --- a/wimlib.spec +++ b/wimlib.spec @@ -15,6 +15,8 @@ BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libntfs-3g) BuildRequires: pkgconfig(libxml-2.0) +# Needed for tests +BuildRequires: ntfsprogs %description wimlib is a C library for creating, modifying, extracting, and mounting files in @@ -60,9 +62,13 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool find $RPM_BUILD_ROOT -name "*.la" -delete +%check +%make_build check + + %files %doc NEWS README -%license COPYING COPYING.CC0 COPYING.GPLv3 +%license COPYING COPYING.GPLv3 %{_libdir}/*.so.15* From e69cb39340ff571c68e166d8b5e12335286c9395 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Mon, 25 Sep 2023 01:16:08 +0200 Subject: [PATCH 3/3] Update to 1.14.3 --- .gitignore | 1 + sources | 2 +- wimlib-1.14.3-tests.patch | 18 ++++++++++++++++++ wimlib.spec | 25 +++++++++++++++++-------- 4 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 wimlib-1.14.3-tests.patch diff --git a/.gitignore b/.gitignore index 4b69893..003b320 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /wimlib-1.13.4.tar.gz /wimlib-1.13.5.tar.gz /wimlib-1.13.6.tar.gz +/wimlib-1.14.3.tar.gz diff --git a/sources b/sources index 590d0c2..b615abe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wimlib-1.13.6.tar.gz) = 5aed00af2071f433a6f7c468d0f8c52fa8e202e69f5f5234976bf2f5f4e498a2bb30840c81287c445fa77ce5d8b91550a67b1c1959f7a0bcd3229a0c44fa0096 +SHA512 (wimlib-1.14.3.tar.gz) = 397121a355e3577eb75590c58d6a00e400c52b5352311fa44a9d7dcc443f409dca14796ba74a807ce893d3cb24072ac642441ec22dc334b34a76d9dd5d135d32 diff --git a/wimlib-1.14.3-tests.patch b/wimlib-1.14.3-tests.patch new file mode 100644 index 0000000..c803a34 --- /dev/null +++ b/wimlib-1.14.3-tests.patch @@ -0,0 +1,18 @@ +diff -up ./Makefile.am.orig ./Makefile.am +--- ./Makefile.am.orig 2023-09-04 20:41:02.000000000 +0200 ++++ ./Makefile.am 2023-09-25 00:59:26.933092055 +0200 +@@ -311,14 +311,6 @@ dist_check_SCRIPTS = tests/test-imagex \ + tests/test-imagex-capture_and_apply \ + tests/test-imagex-update_and_extract + +-if WITH_FUSE +-dist_check_SCRIPTS += tests/test-imagex-mount +-endif +- +-if WITH_NTFS_3G +-dist_check_SCRIPTS += tests/test-imagex-ntfs +-endif +- + EXTRA_DIST += \ + tests/common_tests.sh \ + tests/exclusionlists \ diff --git a/wimlib.spec b/wimlib.spec index cf7be77..f5a7f6b 100644 --- a/wimlib.spec +++ b/wimlib.spec @@ -1,22 +1,27 @@ Name: wimlib -Version: 1.13.6 +Version: 1.14.3 Release: 1%{?dist} Summary: Open source Windows Imaging (WIM) library -# wimlib is dual-licensed (GPLv3+/LGPLv3+) but is linked to libntfs-3g (GPLv3+), -# utilities are GPLv3+, some internal headers are MIT -License: GPLv3+ and MIT +# wimlib is dual-licensed (GPL-3.0-or-later/LGPL-3.0-or-later) but is linked to +# libntfs-3g (GPL-3.0-or-later), utilities are GPL-3.0-or-later, some internal +# headers are MIT +License: GPL-3.0-or-later AND MIT URL: https://wimlib.net/ Source0: %{url}/downloads/%{name}-%{version}.tar.gz +# Disable tests requiring mount privileges +Patch0: %{name}-1.14.3-tests.patch +BuildRequires: automake BuildRequires: make BuildRequires: gcc -BuildRequires: pkgconfig(fuse) +BuildRequires: pkgconfig(fuse3) BuildRequires: pkgconfig(libcrypto) BuildRequires: pkgconfig(libntfs-3g) BuildRequires: pkgconfig(libxml-2.0) # Needed for tests -BuildRequires: ntfsprogs +# BuildRequires: ntfs-3g +# BuildRequires: ntfsprogs %description wimlib is a C library for creating, modifying, extracting, and mounting files in @@ -44,7 +49,7 @@ files in the Windows Imaging Format (WIM files). %prep -%autosetup +%autosetup -p0 %build @@ -67,7 +72,7 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %files -%doc NEWS README +%doc NEWS.md README.md %license COPYING COPYING.GPLv3 %{_libdir}/*.so.15* @@ -84,6 +89,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Sun Sep 24 2023 Mohamed El Morabity - 1.14.3-1 +- Update to 1.14.3 +- Switch license tag to SPDX + * Mon Oct 03 2022 Mohamed El Morabity - 1.13.6-1 - Update to 1.13.6 - Update license tag (CC0 replaced by MIT)