diff --git a/.gitignore b/.gitignore index bedb8e6..4b69893 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,3 @@ /wimlib-1.13.4.tar.gz /wimlib-1.13.5.tar.gz /wimlib-1.13.6.tar.gz -/wimlib-1.14.3.tar.gz -/wimlib-1.14.4.tar.gz -/wimlib-1.14.5.tar.gz diff --git a/sources b/sources index b03de56..590d0c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wimlib-1.14.5.tar.gz) = 60db80a3a93d3b5094a8277be8a41d06632905e4e1780b5def1bca614e5ef90a5627081f78dab17516192295c796bf9679883df4e0addc2d2e342d61d68f9f0b +SHA512 (wimlib-1.13.6.tar.gz) = 5aed00af2071f433a6f7c468d0f8c52fa8e202e69f5f5234976bf2f5f4e498a2bb30840c81287c445fa77ce5d8b91550a67b1c1959f7a0bcd3229a0c44fa0096 diff --git a/wimlib-1.14.3-tests.patch b/wimlib-1.14.3-tests.patch deleted file mode 100644 index c803a34..0000000 --- a/wimlib-1.14.3-tests.patch +++ /dev/null @@ -1,18 +0,0 @@ -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 b70c133..826709f 100644 --- a/wimlib.spec +++ b/wimlib.spec @@ -1,26 +1,22 @@ Name: wimlib -Version: 1.14.5 +Version: 1.13.6 Release: 3%{?dist} Summary: Open source Windows Imaging (WIM) library -# 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 +# 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 URL: https://wimlib.net/ Source0: %{url}/downloads/%{name}-%{version}.tar.gz -# Disable tests requiring mount privileges -Patch0: %{name}-1.14.3-tests.patch -%if 0%{?fedora} <= 42 -BuildRequires: autoconf -BuildRequires: libtool -%endif -BuildRequires: automake BuildRequires: make BuildRequires: gcc -BuildRequires: pkgconfig(fuse3) +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 @@ -48,14 +44,10 @@ files in the Windows Imaging Format (WIM files). %prep -%autosetup -p0 +%autosetup %build -# Ensure build files match the installed Automake version -%if 0%{?fedora} <= 42 -autoreconf -fiv -%endif %configure \ --disable-silent-rules \ --disable-static @@ -71,11 +63,14 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %check +%if 0%{?rhel} +export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/.libs +%endif %make_build check %files -%doc NEWS.md README.md +%doc NEWS README %license COPYING COPYING.GPLv3 %{_libdir}/*.so.15* @@ -92,46 +87,8 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog -* Thu Aug 27 2026 Tom Callaway - 1.14.5-3 -- rebuild for new ntfs-3g - -* Fri Jul 17 2026 Fedora Release Engineering - 1.14.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Tue Mar 10 2026 Mohamed El Morabity - 1.14.5-1 -- Update to 1.14.5 - -* Sat Jan 17 2026 Fedora Release Engineering - 1.14.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Tue Nov 4 2025 Tom Callaway - 1.14.4-6 -- rebuild for new fuse3 - -* Fri Jul 25 2025 Fedora Release Engineering - 1.14.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Jan 25 2025 Mohamed El Morabity - 1.14.4-4 -- Fix FTBFS (RHBZ #2341541) -- Drop useless BuildRequires - -* Sun Jan 19 2025 Fedora Release Engineering - 1.14.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 1.14.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Mar 02 2024 Mohamed El Morabity - 1.14.4-1 -- Update to 1.14.4 - -* Sat Jan 27 2024 Fedora Release Engineering - 1.14.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Sep 24 2023 Mohamed El Morabity - 1.14.3-1 -- Update to 1.14.3 -- Switch license tag to SPDX - -* Sat Jul 22 2023 Fedora Release Engineering - 1.13.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild +* Sun Mar 26 2023 Davide Cavalca - 1.13.6-3 +- Fix tests for EPEL builds * Sat Jan 21 2023 Fedora Release Engineering - 1.13.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild