From f981da5b713ae0e7804dad9e434fae44fcd3bb83 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Mon, 25 Sep 2023 01:16:08 +0200 Subject: [PATCH 1/2] Update to 1.14.3 --- .gitignore | 1 + sources | 2 +- wimlib-1.14.3-tests.patch | 18 ++++++++++++++++++ wimlib.spec | 27 ++++++++++++++++++--------- 4 files changed, 38 insertions(+), 10 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 d46aef3..33da613 100644 --- a/wimlib.spec +++ b/wimlib.spec @@ -1,22 +1,27 @@ Name: wimlib -Version: 1.13.6 -Release: 2%{?dist} +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 + * Sat Jan 21 2023 Fedora Release Engineering - 1.13.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 0037594cac266e8ebcd545ddce90c22b367c0826 Mon Sep 17 00:00:00 2001 From: Mohamed El Morabity Date: Sat, 2 Mar 2024 23:28:05 +0100 Subject: [PATCH 2/2] Update to 1.14.4 --- .gitignore | 1 + sources | 2 +- wimlib.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 003b320..dfc733a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /wimlib-1.13.5.tar.gz /wimlib-1.13.6.tar.gz /wimlib-1.14.3.tar.gz +/wimlib-1.14.4.tar.gz diff --git a/sources b/sources index b615abe..c2f0c73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wimlib-1.14.3.tar.gz) = 397121a355e3577eb75590c58d6a00e400c52b5352311fa44a9d7dcc443f409dca14796ba74a807ce893d3cb24072ac642441ec22dc334b34a76d9dd5d135d32 +SHA512 (wimlib-1.14.4.tar.gz) = f3c25ee14fe849f452f004ce8137ef040410ea048555ae71180086f010858b6ed593c8881b805bac65f9ee878bf11661a7f17677c6c24e2c77149c35ee0cd853 diff --git a/wimlib.spec b/wimlib.spec index 33da613..ed1d180 100644 --- a/wimlib.spec +++ b/wimlib.spec @@ -1,5 +1,5 @@ Name: wimlib -Version: 1.14.3 +Version: 1.14.4 Release: 1%{?dist} Summary: Open source Windows Imaging (WIM) library @@ -89,6 +89,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Sat Mar 02 2024 Mohamed El Morabity - 1.14.4-1 +- Update to 1.14.4 + * Sun Sep 24 2023 Mohamed El Morabity - 1.14.3-1 - Update to 1.14.3 - Switch license tag to SPDX