From eee78dd3048e932ddf6a5f6d4c63638e36f4d0a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:55:07 +0000 Subject: [PATCH 01/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmount.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmount.spec b/xmount.spec index d342eaa..b430955 100644 --- a/xmount.spec +++ b/xmount.spec @@ -2,7 +2,7 @@ Name: xmount Version: 0.7.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A on-the-fly convert for multiple hard disk image types License: GPLv3+ @@ -67,6 +67,9 @@ chmod -x src/xmount.* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.7.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0.7.6-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a28008059d4ad415942b8986a65366b91ea03b0d Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:50 +0200 Subject: [PATCH 02/15] Eliminate use of obsolete %patchN syntax (#2283636) --- xmount.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmount.spec b/xmount.spec index b430955..b09f219 100644 --- a/xmount.spec +++ b/xmount.spec @@ -36,10 +36,10 @@ VmWare, or alike. %prep %setup -q -%patch0 -p1 -b .suffix +%patch -P0 -p1 -b .suffix # Use std=99 on rhel7, uneeded nowadays %if 0%{?fedora} || 0%{?rhel} > 7 -%patch1 -p1 -b .cflags +%patch -P1 -p1 -b .cflags %endif # Fix perm chmod -x src/xmount.* From 19a24034d03182604c5c933109cb7d1136db14d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:15:57 +0000 Subject: [PATCH 03/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xmount.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmount.spec b/xmount.spec index b09f219..fef4f46 100644 --- a/xmount.spec +++ b/xmount.spec @@ -2,7 +2,7 @@ Name: xmount Version: 0.7.6 -Release: 14%{?dist} +Release: 15%{?dist} Summary: A on-the-fly convert for multiple hard disk image types License: GPLv3+ @@ -67,6 +67,9 @@ chmod -x src/xmount.* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.7.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0.7.6-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d4573a4ff19fac8709c1eba391ae0e442061d94e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 13:33:34 +0200 Subject: [PATCH 04/15] convert GPLv3+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xmount.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xmount.spec b/xmount.spec index fef4f46..386ea5e 100644 --- a/xmount.spec +++ b/xmount.spec @@ -2,10 +2,11 @@ Name: xmount Version: 0.7.6 -Release: 15%{?dist} +Release: 16%{?dist} Summary: A on-the-fly convert for multiple hard disk image types -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later URL: https://www.pinguin.lu/index.php Source0: https://files.pinguin.lu/%{name}-%{version}.tar.gz Patch0: xmount-suffix.patch @@ -67,6 +68,9 @@ chmod -x src/xmount.* %changelog +* Thu Jul 25 2024 Miroslav Suchý - 0.7.6-16 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 0.7.6-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 75eb16e8b6609632124ff2d816ba849630996be9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:04:17 +0000 Subject: [PATCH 05/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xmount.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmount.spec b/xmount.spec index 386ea5e..d5a8ed8 100644 --- a/xmount.spec +++ b/xmount.spec @@ -2,7 +2,7 @@ Name: xmount Version: 0.7.6 -Release: 16%{?dist} +Release: 17%{?dist} Summary: A on-the-fly convert for multiple hard disk image types # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -68,6 +68,9 @@ chmod -x src/xmount.* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.7.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 25 2024 Miroslav Suchý - 0.7.6-16 - convert license to SPDX From e8f029ceb39ca2eedf71ddbe3dd397ccb88fb8a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:57:30 +0000 Subject: [PATCH 06/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmount.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmount.spec b/xmount.spec index d5a8ed8..0cbced8 100644 --- a/xmount.spec +++ b/xmount.spec @@ -2,7 +2,7 @@ Name: xmount Version: 0.7.6 -Release: 17%{?dist} +Release: 18%{?dist} Summary: A on-the-fly convert for multiple hard disk image types # Automatically converted from old format: GPLv3+ - review is highly recommended. @@ -68,6 +68,9 @@ chmod -x src/xmount.* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.7.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 0.7.6-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 2e9f2eda2da943426b996bff980398efe14628a9 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Tue, 19 Aug 2025 22:44:57 -0500 Subject: [PATCH 07/15] Orphaned for 6+ weeks --- .gitignore | 4 - dead.package | 1 + sources | 1 - xmount-cflags.patch | 13 --- xmount-suffix.patch | 92 --------------------- xmount.spec | 193 -------------------------------------------- 6 files changed, 1 insertion(+), 303 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xmount-cflags.patch delete mode 100644 xmount-suffix.patch delete mode 100644 xmount.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 48a339d..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/xmount-0.5.0.tar.gz -/xmount-0.6.0.tar.gz -/xmount-0.7.3.tar.gz -/xmount-0.7.6.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index ed64e11..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (xmount-0.7.6.tar.gz) = 4890d4a6a2ff825ab61c44bf3ffa194d98b5b958a2502ce14beddbc363522a474ad4830e3d9e2806c647d4918c64c8cdf42b7ee39088a60fd5934c8ca0e616ad diff --git a/xmount-cflags.patch b/xmount-cflags.patch deleted file mode 100644 index 3670555..0000000 --- a/xmount-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up xmount-0.7.6/CMakeLists.txt.cflags xmount-0.7.6/CMakeLists.txt ---- xmount-0.7.6/CMakeLists.txt.cflags 2018-04-16 11:22:27.000000000 +0200 -+++ xmount-0.7.6/CMakeLists.txt 2018-08-13 15:38:08.571593927 +0200 -@@ -85,9 +85,6 @@ include_directories(${CMAKE_CURRENT_BINA - add_definitions(-D_LARGEFILE64_SOURCE) - add_definitions(-D_FILE_OFFSET_BITS=64) - add_definitions(-D_GNU_SOURCE) --set(CMAKE_C_FLAGS "-fno-strict-aliasing -std=c99 -Wall") --set(CMAKE_C_FLAGS_RELEASE "-O2 ${CMAKE_C_FLAGS}") --set(CMAKE_C_FLAGS_DEBUG "-ggdb -O0 ${CMAKE_C_FLAGS}") - - # Check that off_t can represent 2**63 - 1 correctly. - # If it can't, we need to set _FILE_OFFSET_BITS=64 diff --git a/xmount-suffix.patch b/xmount-suffix.patch deleted file mode 100644 index 86f672d..0000000 --- a/xmount-suffix.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff -up xmount-0.7.6/libxmount_input/libxmount_input_aaff/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_aaff/CMakeLists.txt ---- xmount-0.7.6/libxmount_input/libxmount_input_aaff/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_input/libxmount_input_aaff/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 -@@ -9,5 +9,5 @@ include_directories(${LIBZ_INCLUDE_DIRS} - - target_link_libraries(xmount_input_aaff ${LIBZ_LIBRARIES}) - --install(TARGETS xmount_input_aaff DESTINATION lib/xmount) -+install(TARGETS xmount_input_aaff DESTINATION lib${LIB_SUFFIX}/xmount) - -diff -up xmount-0.7.6/libxmount_input/libxmount_input_aewf/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_aewf/CMakeLists.txt ---- xmount-0.7.6/libxmount_input/libxmount_input_aewf/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_input/libxmount_input_aewf/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 -@@ -10,5 +10,5 @@ include_directories(${LIBZ_INCLUDE_DIRS} - - target_link_libraries(xmount_input_aewf ${LIBZ_LIBRARIES}) - --install(TARGETS xmount_input_aewf DESTINATION lib/xmount) -+install(TARGETS xmount_input_aewf DESTINATION lib${LIB_SUFFIX}/xmount) - -diff -up xmount-0.7.6/libxmount_input/libxmount_input_aff/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_aff/CMakeLists.txt ---- xmount-0.7.6/libxmount_input/libxmount_input_aff/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_input/libxmount_input_aff/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 -@@ -61,5 +61,5 @@ endif(NOT STATIC_AFF) - - target_link_libraries(xmount_input_aff ${LIBS}) - --install(TARGETS xmount_input_aff DESTINATION lib/xmount) -+install(TARGETS xmount_input_aff DESTINATION lib${LIB_SUFFIX}/xmount) - -diff -up xmount-0.7.6/libxmount_input/libxmount_input_ewf/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_ewf/CMakeLists.txt ---- xmount-0.7.6/libxmount_input/libxmount_input_ewf/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_input/libxmount_input_ewf/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 -@@ -24,5 +24,5 @@ endif(NOT STATIC_EWF) - - target_link_libraries(xmount_input_ewf ${LIBS}) - --install(TARGETS xmount_input_ewf DESTINATION lib/xmount) -+install(TARGETS xmount_input_ewf DESTINATION lib${LIB_SUFFIX}/xmount) - -diff -up xmount-0.7.6/libxmount_input/libxmount_input_raw/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_raw/CMakeLists.txt ---- xmount-0.7.6/libxmount_input/libxmount_input_raw/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_input/libxmount_input_raw/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 -@@ -6,5 +6,5 @@ project(libxmount_input_raw C) - - add_library(xmount_input_raw SHARED libxmount_input_raw.c ../../libxmount/libxmount.c) - --install(TARGETS xmount_input_raw DESTINATION lib/xmount) -+install(TARGETS xmount_input_raw DESTINATION lib${LIB_SUFFIX}/xmount) - -diff -up xmount-0.7.6/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt.suffix xmount-0.7.6/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt ---- xmount-0.7.6/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 -@@ -6,5 +6,5 @@ project(libxmount_morphing_combine C) - - add_library(xmount_morphing_combine SHARED libxmount_morphing_combine.c ../../libxmount/libxmount.c) - --install(TARGETS xmount_morphing_combine DESTINATION lib/xmount) -+install(TARGETS xmount_morphing_combine DESTINATION lib${LIB_SUFFIX}/xmount) - -diff -up xmount-0.7.6/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt.suffix xmount-0.7.6/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt ---- xmount-0.7.6/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt 2018-08-13 17:04:46.055822892 +0200 -@@ -6,5 +6,5 @@ project(libxmount_morphing_raid C) - - add_library(xmount_morphing_raid SHARED libxmount_morphing_raid.c ../../libxmount/libxmount.c) - --install(TARGETS xmount_morphing_raid DESTINATION lib/xmount) -+install(TARGETS xmount_morphing_raid DESTINATION lib${LIB_SUFFIX}/xmount) - -diff -up xmount-0.7.6/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt.suffix xmount-0.7.6/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt ---- xmount-0.7.6/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt 2018-08-13 17:04:46.055822892 +0200 -@@ -6,5 +6,5 @@ project(libxmount_morphing_unallocated C - - add_library(xmount_morphing_unallocated SHARED libxmount_morphing_unallocated.c hfs_functions.c fat_functions.c ../../libxmount/libxmount.c) - --install(TARGETS xmount_morphing_unallocated DESTINATION lib/xmount) -+install(TARGETS xmount_morphing_unallocated DESTINATION lib${LIB_SUFFIX}/xmount) - -diff -up xmount-0.7.6/src/CMakeLists.txt.suffix xmount-0.7.6/src/CMakeLists.txt ---- xmount-0.7.6/src/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/src/CMakeLists.txt 2018-08-13 17:05:13.587979063 +0200 -@@ -9,7 +9,7 @@ endif(NOT APPLE) - - set(LIBS ${LIBS} "dl") - --add_definitions(-DXMOUNT_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/lib/xmount") -+add_definitions(-DXMOUNT_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/xmount") - - add_executable(xmount xmount.c md5.c ../libxmount/libxmount.c) - diff --git a/xmount.spec b/xmount.spec deleted file mode 100644 index 0cbced8..0000000 --- a/xmount.spec +++ /dev/null @@ -1,193 +0,0 @@ -%undefine __cmake_in_source_build - -Name: xmount -Version: 0.7.6 -Release: 18%{?dist} -Summary: A on-the-fly convert for multiple hard disk image types - -# Automatically converted from old format: GPLv3+ - review is highly recommended. -License: GPL-3.0-or-later -URL: https://www.pinguin.lu/index.php -Source0: https://files.pinguin.lu/%{name}-%{version}.tar.gz -Patch0: xmount-suffix.patch -Patch1: xmount-cflags.patch - -BuildRequires: gcc-c++ -BuildRequires: fuse-devel -BuildRequires: libewf-devel -BuildRequires: afflib-devel -BuildRequires: zlib-devel -BuildRequires: cmake - -Provides: bundled(md5-deutsch) - -%description -xmount allows you to convert on-the-fly between multiple input -and output hard disk image types. xmount creates a virtual file -system using FUSE (Filesystem in Userspace) that contains a virtual -representation of the input image. The virtual representation can -be in raw DD, VirtualBox's virtual disk file format or in VmWare's -VMDK file format. Input images can be raw DD, EWF (Expert Witness -Compression Format) or AFF (Advanced Forensic Format) files. In -addition, xmount also supports virtual write access to the output -files that is redirected to a cache file. This makes it possible -to boot acquired hard disk images using QEMU, KVM, VirtualBox, -VmWare, or alike. - - -%prep -%setup -q -%patch -P0 -p1 -b .suffix -# Use std=99 on rhel7, uneeded nowadays -%if 0%{?fedora} || 0%{?rhel} > 7 -%patch -P1 -p1 -b .cflags -%endif -# Fix perm -chmod -x src/xmount.* - - -%build -%cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - %{nil} - -%cmake_build - - -%install -%cmake_install - - -%files -%doc AUTHORS ChangeLog NEWS README ROADMAP TODO -%license COPYING -%{_mandir}/man*/%{name}*.* -%{_bindir}/%{name} -%{_libdir}/xmount - - -%changelog -* Fri Jul 25 2025 Fedora Release Engineering - 0.7.6-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 0.7.6-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 25 2024 Miroslav Suchý - 0.7.6-16 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 0.7.6-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 0.7.6-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 0.7.6-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 0.7.6-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 0.7.6-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.7.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.7.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 0.7.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.7.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 0.7.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 0.7.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 0.7.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Aug 13 2018 Nicolas Chauvet - 0.7.6-3 -- Fix build down to epel7 -- Add missing hook -- Better space handling - -* Sat Jul 14 2018 Fedora Release Engineering - 0.7.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jun 18 2018 Fabian Affolter - 0.7.6-1 -- Update to new upstream version 0.7.6 (rhbz#1316252) - -* Fri Feb 09 2018 Fedora Release Engineering - 0.7.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.7.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.7.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Apr 02 2016 Fabian Affolter - 0.7.3-1 -- Update to new upstream version 0.7.3 (rhbz#1316252) - -* Fri Feb 05 2016 Fedora Release Engineering - 0.6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0.6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Aug 19 2014 Michal Ambroz - 0.6.0-4 -- enable build with newer ewf library - -* Mon Aug 18 2014 Fedora Release Engineering - 0.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jun 05 2014 Fabian Affolter - 0.6.0-1 -- Update to new upstream version 0.6.0 - -* Sun Aug 04 2013 Fedora Release Engineering - 0.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Mar 01 2013 Nicolas Chauvet - 0.5.0-4 -- Rebuilt for libewf - -* Fri Feb 15 2013 Fedora Release Engineering - 0.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Sep 02 2012 Fabian Affolter - 0.5.0-2 -- Clean section remove -- BR update - -* Mon Aug 06 2012 Fabian Affolter - 0.5.0-1 -- Add a provide -- Permissions were fixed upstream -- Update to new upstream version 0.5.0 - -* Sat Jun 30 2012 Fabian Affolter - 0.4.7-2 -- Leave md5 implementation in place - -* Fri Apr 13 2012 Fabian Affolter - 0.4.7-1 -- Update to new upstream version 0.4.7 - -* Tue Oct 18 2011 Fabian Affolter - 0.4.6-1 -- Update to new upstream version 0.4.6 - -* Wed Sep 01 2010 Fabian Affolter - 0.4.2-2 -- Add patch from #606073 -- Fix permission -- Add needed BRs - -* Mon Mar 15 2010 Fabian Affolter - 0.4.2-1 -- Initial package for Fedora From cc726bec3e34ea8f9efe7057d89acdf8a6410050 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Aug 2025 16:29:55 +0000 Subject: [PATCH 08/15] Unretirement request: pagure.io/releng/issue/12912 Revert "Orphaned for 6+ weeks" This reverts commit 2e9f2eda2da943426b996bff980398efe14628a9. Signed-off-by: Fedora Release Engineering --- .gitignore | 4 + dead.package | 1 - sources | 1 + xmount-cflags.patch | 13 +++ xmount-suffix.patch | 92 +++++++++++++++++++++ xmount.spec | 193 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 303 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100644 sources create mode 100644 xmount-cflags.patch create mode 100644 xmount-suffix.patch create mode 100644 xmount.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..48a339d --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/xmount-0.5.0.tar.gz +/xmount-0.6.0.tar.gz +/xmount-0.7.3.tar.gz +/xmount-0.7.6.tar.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/sources b/sources new file mode 100644 index 0000000..ed64e11 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (xmount-0.7.6.tar.gz) = 4890d4a6a2ff825ab61c44bf3ffa194d98b5b958a2502ce14beddbc363522a474ad4830e3d9e2806c647d4918c64c8cdf42b7ee39088a60fd5934c8ca0e616ad diff --git a/xmount-cflags.patch b/xmount-cflags.patch new file mode 100644 index 0000000..3670555 --- /dev/null +++ b/xmount-cflags.patch @@ -0,0 +1,13 @@ +diff -up xmount-0.7.6/CMakeLists.txt.cflags xmount-0.7.6/CMakeLists.txt +--- xmount-0.7.6/CMakeLists.txt.cflags 2018-04-16 11:22:27.000000000 +0200 ++++ xmount-0.7.6/CMakeLists.txt 2018-08-13 15:38:08.571593927 +0200 +@@ -85,9 +85,6 @@ include_directories(${CMAKE_CURRENT_BINA + add_definitions(-D_LARGEFILE64_SOURCE) + add_definitions(-D_FILE_OFFSET_BITS=64) + add_definitions(-D_GNU_SOURCE) +-set(CMAKE_C_FLAGS "-fno-strict-aliasing -std=c99 -Wall") +-set(CMAKE_C_FLAGS_RELEASE "-O2 ${CMAKE_C_FLAGS}") +-set(CMAKE_C_FLAGS_DEBUG "-ggdb -O0 ${CMAKE_C_FLAGS}") + + # Check that off_t can represent 2**63 - 1 correctly. + # If it can't, we need to set _FILE_OFFSET_BITS=64 diff --git a/xmount-suffix.patch b/xmount-suffix.patch new file mode 100644 index 0000000..86f672d --- /dev/null +++ b/xmount-suffix.patch @@ -0,0 +1,92 @@ +diff -up xmount-0.7.6/libxmount_input/libxmount_input_aaff/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_aaff/CMakeLists.txt +--- xmount-0.7.6/libxmount_input/libxmount_input_aaff/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 ++++ xmount-0.7.6/libxmount_input/libxmount_input_aaff/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 +@@ -9,5 +9,5 @@ include_directories(${LIBZ_INCLUDE_DIRS} + + target_link_libraries(xmount_input_aaff ${LIBZ_LIBRARIES}) + +-install(TARGETS xmount_input_aaff DESTINATION lib/xmount) ++install(TARGETS xmount_input_aaff DESTINATION lib${LIB_SUFFIX}/xmount) + +diff -up xmount-0.7.6/libxmount_input/libxmount_input_aewf/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_aewf/CMakeLists.txt +--- xmount-0.7.6/libxmount_input/libxmount_input_aewf/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 ++++ xmount-0.7.6/libxmount_input/libxmount_input_aewf/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 +@@ -10,5 +10,5 @@ include_directories(${LIBZ_INCLUDE_DIRS} + + target_link_libraries(xmount_input_aewf ${LIBZ_LIBRARIES}) + +-install(TARGETS xmount_input_aewf DESTINATION lib/xmount) ++install(TARGETS xmount_input_aewf DESTINATION lib${LIB_SUFFIX}/xmount) + +diff -up xmount-0.7.6/libxmount_input/libxmount_input_aff/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_aff/CMakeLists.txt +--- xmount-0.7.6/libxmount_input/libxmount_input_aff/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 ++++ xmount-0.7.6/libxmount_input/libxmount_input_aff/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 +@@ -61,5 +61,5 @@ endif(NOT STATIC_AFF) + + target_link_libraries(xmount_input_aff ${LIBS}) + +-install(TARGETS xmount_input_aff DESTINATION lib/xmount) ++install(TARGETS xmount_input_aff DESTINATION lib${LIB_SUFFIX}/xmount) + +diff -up xmount-0.7.6/libxmount_input/libxmount_input_ewf/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_ewf/CMakeLists.txt +--- xmount-0.7.6/libxmount_input/libxmount_input_ewf/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 ++++ xmount-0.7.6/libxmount_input/libxmount_input_ewf/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 +@@ -24,5 +24,5 @@ endif(NOT STATIC_EWF) + + target_link_libraries(xmount_input_ewf ${LIBS}) + +-install(TARGETS xmount_input_ewf DESTINATION lib/xmount) ++install(TARGETS xmount_input_ewf DESTINATION lib${LIB_SUFFIX}/xmount) + +diff -up xmount-0.7.6/libxmount_input/libxmount_input_raw/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_raw/CMakeLists.txt +--- xmount-0.7.6/libxmount_input/libxmount_input_raw/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 ++++ xmount-0.7.6/libxmount_input/libxmount_input_raw/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 +@@ -6,5 +6,5 @@ project(libxmount_input_raw C) + + add_library(xmount_input_raw SHARED libxmount_input_raw.c ../../libxmount/libxmount.c) + +-install(TARGETS xmount_input_raw DESTINATION lib/xmount) ++install(TARGETS xmount_input_raw DESTINATION lib${LIB_SUFFIX}/xmount) + +diff -up xmount-0.7.6/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt.suffix xmount-0.7.6/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt +--- xmount-0.7.6/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 ++++ xmount-0.7.6/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 +@@ -6,5 +6,5 @@ project(libxmount_morphing_combine C) + + add_library(xmount_morphing_combine SHARED libxmount_morphing_combine.c ../../libxmount/libxmount.c) + +-install(TARGETS xmount_morphing_combine DESTINATION lib/xmount) ++install(TARGETS xmount_morphing_combine DESTINATION lib${LIB_SUFFIX}/xmount) + +diff -up xmount-0.7.6/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt.suffix xmount-0.7.6/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt +--- xmount-0.7.6/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 ++++ xmount-0.7.6/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt 2018-08-13 17:04:46.055822892 +0200 +@@ -6,5 +6,5 @@ project(libxmount_morphing_raid C) + + add_library(xmount_morphing_raid SHARED libxmount_morphing_raid.c ../../libxmount/libxmount.c) + +-install(TARGETS xmount_morphing_raid DESTINATION lib/xmount) ++install(TARGETS xmount_morphing_raid DESTINATION lib${LIB_SUFFIX}/xmount) + +diff -up xmount-0.7.6/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt.suffix xmount-0.7.6/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt +--- xmount-0.7.6/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 ++++ xmount-0.7.6/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt 2018-08-13 17:04:46.055822892 +0200 +@@ -6,5 +6,5 @@ project(libxmount_morphing_unallocated C + + add_library(xmount_morphing_unallocated SHARED libxmount_morphing_unallocated.c hfs_functions.c fat_functions.c ../../libxmount/libxmount.c) + +-install(TARGETS xmount_morphing_unallocated DESTINATION lib/xmount) ++install(TARGETS xmount_morphing_unallocated DESTINATION lib${LIB_SUFFIX}/xmount) + +diff -up xmount-0.7.6/src/CMakeLists.txt.suffix xmount-0.7.6/src/CMakeLists.txt +--- xmount-0.7.6/src/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 ++++ xmount-0.7.6/src/CMakeLists.txt 2018-08-13 17:05:13.587979063 +0200 +@@ -9,7 +9,7 @@ endif(NOT APPLE) + + set(LIBS ${LIBS} "dl") + +-add_definitions(-DXMOUNT_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/lib/xmount") ++add_definitions(-DXMOUNT_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/xmount") + + add_executable(xmount xmount.c md5.c ../libxmount/libxmount.c) + diff --git a/xmount.spec b/xmount.spec new file mode 100644 index 0000000..0cbced8 --- /dev/null +++ b/xmount.spec @@ -0,0 +1,193 @@ +%undefine __cmake_in_source_build + +Name: xmount +Version: 0.7.6 +Release: 18%{?dist} +Summary: A on-the-fly convert for multiple hard disk image types + +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later +URL: https://www.pinguin.lu/index.php +Source0: https://files.pinguin.lu/%{name}-%{version}.tar.gz +Patch0: xmount-suffix.patch +Patch1: xmount-cflags.patch + +BuildRequires: gcc-c++ +BuildRequires: fuse-devel +BuildRequires: libewf-devel +BuildRequires: afflib-devel +BuildRequires: zlib-devel +BuildRequires: cmake + +Provides: bundled(md5-deutsch) + +%description +xmount allows you to convert on-the-fly between multiple input +and output hard disk image types. xmount creates a virtual file +system using FUSE (Filesystem in Userspace) that contains a virtual +representation of the input image. The virtual representation can +be in raw DD, VirtualBox's virtual disk file format or in VmWare's +VMDK file format. Input images can be raw DD, EWF (Expert Witness +Compression Format) or AFF (Advanced Forensic Format) files. In +addition, xmount also supports virtual write access to the output +files that is redirected to a cache file. This makes it possible +to boot acquired hard disk images using QEMU, KVM, VirtualBox, +VmWare, or alike. + + +%prep +%setup -q +%patch -P0 -p1 -b .suffix +# Use std=99 on rhel7, uneeded nowadays +%if 0%{?fedora} || 0%{?rhel} > 7 +%patch -P1 -p1 -b .cflags +%endif +# Fix perm +chmod -x src/xmount.* + + +%build +%cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + %{nil} + +%cmake_build + + +%install +%cmake_install + + +%files +%doc AUTHORS ChangeLog NEWS README ROADMAP TODO +%license COPYING +%{_mandir}/man*/%{name}*.* +%{_bindir}/%{name} +%{_libdir}/xmount + + +%changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.7.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 0.7.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 25 2024 Miroslav Suchý - 0.7.6-16 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 0.7.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 0.7.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 0.7.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.7.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.7.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.7.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.7.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 0.7.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.7.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 0.7.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 0.7.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 0.7.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Aug 13 2018 Nicolas Chauvet - 0.7.6-3 +- Fix build down to epel7 +- Add missing hook +- Better space handling + +* Sat Jul 14 2018 Fedora Release Engineering - 0.7.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 18 2018 Fabian Affolter - 0.7.6-1 +- Update to new upstream version 0.7.6 (rhbz#1316252) + +* Fri Feb 09 2018 Fedora Release Engineering - 0.7.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.7.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Apr 02 2016 Fabian Affolter - 0.7.3-1 +- Update to new upstream version 0.7.3 (rhbz#1316252) + +* Fri Feb 05 2016 Fedora Release Engineering - 0.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Aug 19 2014 Michal Ambroz - 0.6.0-4 +- enable build with newer ewf library + +* Mon Aug 18 2014 Fedora Release Engineering - 0.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Jun 05 2014 Fabian Affolter - 0.6.0-1 +- Update to new upstream version 0.6.0 + +* Sun Aug 04 2013 Fedora Release Engineering - 0.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Mar 01 2013 Nicolas Chauvet - 0.5.0-4 +- Rebuilt for libewf + +* Fri Feb 15 2013 Fedora Release Engineering - 0.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Sep 02 2012 Fabian Affolter - 0.5.0-2 +- Clean section remove +- BR update + +* Mon Aug 06 2012 Fabian Affolter - 0.5.0-1 +- Add a provide +- Permissions were fixed upstream +- Update to new upstream version 0.5.0 + +* Sat Jun 30 2012 Fabian Affolter - 0.4.7-2 +- Leave md5 implementation in place + +* Fri Apr 13 2012 Fabian Affolter - 0.4.7-1 +- Update to new upstream version 0.4.7 + +* Tue Oct 18 2011 Fabian Affolter - 0.4.6-1 +- Update to new upstream version 0.4.6 + +* Wed Sep 01 2010 Fabian Affolter - 0.4.2-2 +- Add patch from #606073 +- Fix permission +- Add needed BRs + +* Mon Mar 15 2010 Fabian Affolter - 0.4.2-1 +- Initial package for Fedora From c0c02a35da5a08e16d22b6506f2cafbc06c2438c Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 21 Aug 2025 15:57:33 +0200 Subject: [PATCH 09/15] Update to 1.2.0 --- .gitignore | 5 +- sources | 2 +- xmount-cflags.patch | 26 +++++++-- xmount-suffix.patch | 135 +++++++++++++++++++++++++++++++++----------- xmount.spec | 18 +++--- 5 files changed, 131 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index 48a339d..0f68526 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/xmount-0.5.0.tar.gz -/xmount-0.6.0.tar.gz -/xmount-0.7.3.tar.gz -/xmount-0.7.6.tar.gz +xmount-*.tar.* diff --git a/sources b/sources index ed64e11..c9ea5a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmount-0.7.6.tar.gz) = 4890d4a6a2ff825ab61c44bf3ffa194d98b5b958a2502ce14beddbc363522a474ad4830e3d9e2806c647d4918c64c8cdf42b7ee39088a60fd5934c8ca0e616ad +SHA512 (xmount-1.2.0.tar.bz2) = 7df2974eae84f22fc30d4971fe4f5d4e3b3fc1698703fc75b206777a06d2c3708e8d4f1c95f8c1c259ded2e99895ab5f8d35b583a3966b250ceb4f3029793575 diff --git a/xmount-cflags.patch b/xmount-cflags.patch index 3670555..1218517 100644 --- a/xmount-cflags.patch +++ b/xmount-cflags.patch @@ -1,7 +1,18 @@ -diff -up xmount-0.7.6/CMakeLists.txt.cflags xmount-0.7.6/CMakeLists.txt ---- xmount-0.7.6/CMakeLists.txt.cflags 2018-04-16 11:22:27.000000000 +0200 -+++ xmount-0.7.6/CMakeLists.txt 2018-08-13 15:38:08.571593927 +0200 -@@ -85,9 +85,6 @@ include_directories(${CMAKE_CURRENT_BINA +From 7ea54293aea783e88545662d807bb5efc527d58d Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Tue, 26 Aug 2025 11:10:25 +0200 +Subject: [PATCH 2/2] Drop C_FLAGS tweaks + +Signed-off-by: Nicolas Chauvet +--- + CMakeLists.txt | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7369014065b5..e0064598f406 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -87,9 +87,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_definitions(-D_LARGEFILE64_SOURCE) add_definitions(-D_FILE_OFFSET_BITS=64) add_definitions(-D_GNU_SOURCE) @@ -9,5 +20,8 @@ diff -up xmount-0.7.6/CMakeLists.txt.cflags xmount-0.7.6/CMakeLists.txt -set(CMAKE_C_FLAGS_RELEASE "-O2 ${CMAKE_C_FLAGS}") -set(CMAKE_C_FLAGS_DEBUG "-ggdb -O0 ${CMAKE_C_FLAGS}") - # Check that off_t can represent 2**63 - 1 correctly. - # If it can't, we need to set _FILE_OFFSET_BITS=64 + # Compile stuff in sub dirs + add_subdirectory(libxmount_input) +-- +2.51.0 + diff --git a/xmount-suffix.patch b/xmount-suffix.patch index 86f672d..3d0814a 100644 --- a/xmount-suffix.patch +++ b/xmount-suffix.patch @@ -1,36 +1,74 @@ -diff -up xmount-0.7.6/libxmount_input/libxmount_input_aaff/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_aaff/CMakeLists.txt ---- xmount-0.7.6/libxmount_input/libxmount_input_aaff/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_input/libxmount_input_aaff/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 -@@ -9,5 +9,5 @@ include_directories(${LIBZ_INCLUDE_DIRS} +From 257d1aa10816988dd60a4c69efe6a60bb43722d6 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Tue, 26 Aug 2025 11:05:33 +0200 +Subject: [PATCH 1/2] Add LIB_SUFFIX to library path + +This is needed in order to install the libraries into the appropriate +path for libraries + +Signed-off-by: Nicolas Chauvet +--- + libxmount_input/libxmount_input_aaff/CMakeLists.txt | 2 +- + libxmount_input/libxmount_input_aewf/CMakeLists.txt | 2 +- + libxmount_input/libxmount_input_aff/CMakeLists.txt | 2 +- + libxmount_input/libxmount_input_aff4/CMakeLists.txt | 2 +- + libxmount_input/libxmount_input_ewf/CMakeLists.txt | 2 +- + libxmount_input/libxmount_input_qcow/CMakeLists.txt | 2 +- + libxmount_input/libxmount_input_raw/CMakeLists.txt | 2 +- + libxmount_input/libxmount_input_vdi/CMakeLists.txt | 2 +- + libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt | 2 +- + libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt | 2 +- + .../libxmount_morphing_unallocated/CMakeLists.txt | 2 +- + src/CMakeLists.txt | 2 +- + 12 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/libxmount_input/libxmount_input_aaff/CMakeLists.txt b/libxmount_input/libxmount_input_aaff/CMakeLists.txt +index ec438d50a97f..cf59bcb16374 100644 +--- a/libxmount_input/libxmount_input_aaff/CMakeLists.txt ++++ b/libxmount_input/libxmount_input_aaff/CMakeLists.txt +@@ -22,5 +22,5 @@ endif(NOT STATIC) - target_link_libraries(xmount_input_aaff ${LIBZ_LIBRARIES}) + target_link_libraries(xmount_input_aaff ${LIBS}) -install(TARGETS xmount_input_aaff DESTINATION lib/xmount) +install(TARGETS xmount_input_aaff DESTINATION lib${LIB_SUFFIX}/xmount) -diff -up xmount-0.7.6/libxmount_input/libxmount_input_aewf/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_aewf/CMakeLists.txt ---- xmount-0.7.6/libxmount_input/libxmount_input_aewf/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_input/libxmount_input_aewf/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 -@@ -10,5 +10,5 @@ include_directories(${LIBZ_INCLUDE_DIRS} +diff --git a/libxmount_input/libxmount_input_aewf/CMakeLists.txt b/libxmount_input/libxmount_input_aewf/CMakeLists.txt +index 05d03116af59..e49da30649a8 100644 +--- a/libxmount_input/libxmount_input_aewf/CMakeLists.txt ++++ b/libxmount_input/libxmount_input_aewf/CMakeLists.txt +@@ -30,5 +30,5 @@ endif(NOT STATIC) - target_link_libraries(xmount_input_aewf ${LIBZ_LIBRARIES}) + target_link_libraries(xmount_input_aewf ${LIBS}) -install(TARGETS xmount_input_aewf DESTINATION lib/xmount) +install(TARGETS xmount_input_aewf DESTINATION lib${LIB_SUFFIX}/xmount) -diff -up xmount-0.7.6/libxmount_input/libxmount_input_aff/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_aff/CMakeLists.txt ---- xmount-0.7.6/libxmount_input/libxmount_input_aff/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_input/libxmount_input_aff/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 -@@ -61,5 +61,5 @@ endif(NOT STATIC_AFF) +diff --git a/libxmount_input/libxmount_input_aff/CMakeLists.txt b/libxmount_input/libxmount_input_aff/CMakeLists.txt +index 207d5d4c4d66..049c3ef5a9ad 100644 +--- a/libxmount_input/libxmount_input_aff/CMakeLists.txt ++++ b/libxmount_input/libxmount_input_aff/CMakeLists.txt +@@ -70,4 +70,4 @@ add_library(xmount_input_aff SHARED libxmount_input_aff.c) target_link_libraries(xmount_input_aff ${LIBS}) -install(TARGETS xmount_input_aff DESTINATION lib/xmount) +install(TARGETS xmount_input_aff DESTINATION lib${LIB_SUFFIX}/xmount) +diff --git a/libxmount_input/libxmount_input_aff4/CMakeLists.txt b/libxmount_input/libxmount_input_aff4/CMakeLists.txt +index b8bdc5b81c25..139e13dd6a5b 100644 +--- a/libxmount_input/libxmount_input_aff4/CMakeLists.txt ++++ b/libxmount_input/libxmount_input_aff4/CMakeLists.txt +@@ -33,5 +33,5 @@ add_library(xmount_input_aff4 SHARED libxmount_input_aff4.c) -diff -up xmount-0.7.6/libxmount_input/libxmount_input_ewf/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_ewf/CMakeLists.txt ---- xmount-0.7.6/libxmount_input/libxmount_input_ewf/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_input/libxmount_input_ewf/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 + target_link_libraries(xmount_input_aff4 ${LIBS}) + +-install(TARGETS xmount_input_aff4 DESTINATION lib/xmount) ++install(TARGETS xmount_input_aff4 DESTINATION lib${LIB_SUFFIX}/xmount) + +diff --git a/libxmount_input/libxmount_input_ewf/CMakeLists.txt b/libxmount_input/libxmount_input_ewf/CMakeLists.txt +index 75620009f07e..8f4bc1f653bf 100644 +--- a/libxmount_input/libxmount_input_ewf/CMakeLists.txt ++++ b/libxmount_input/libxmount_input_ewf/CMakeLists.txt @@ -24,5 +24,5 @@ endif(NOT STATIC_EWF) target_link_libraries(xmount_input_ewf ${LIBS}) @@ -38,9 +76,20 @@ diff -up xmount-0.7.6/libxmount_input/libxmount_input_ewf/CMakeLists.txt.suffix -install(TARGETS xmount_input_ewf DESTINATION lib/xmount) +install(TARGETS xmount_input_ewf DESTINATION lib${LIB_SUFFIX}/xmount) -diff -up xmount-0.7.6/libxmount_input/libxmount_input_raw/CMakeLists.txt.suffix xmount-0.7.6/libxmount_input/libxmount_input_raw/CMakeLists.txt ---- xmount-0.7.6/libxmount_input/libxmount_input_raw/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_input/libxmount_input_raw/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 +diff --git a/libxmount_input/libxmount_input_qcow/CMakeLists.txt b/libxmount_input/libxmount_input_qcow/CMakeLists.txt +index 7e38241eee74..c2629856674d 100644 +--- a/libxmount_input/libxmount_input_qcow/CMakeLists.txt ++++ b/libxmount_input/libxmount_input_qcow/CMakeLists.txt +@@ -22,4 +22,4 @@ endif(NOT STATIC) + + target_link_libraries(xmount_input_qcow ${LIBS}) + +-install(TARGETS xmount_input_qcow DESTINATION lib/xmount) ++install(TARGETS xmount_input_qcow DESTINATION lib${LIB_SUFFIX}/xmount) +diff --git a/libxmount_input/libxmount_input_raw/CMakeLists.txt b/libxmount_input/libxmount_input_raw/CMakeLists.txt +index 0bd6b42551d0..1b9b0fb8c6de 100644 +--- a/libxmount_input/libxmount_input_raw/CMakeLists.txt ++++ b/libxmount_input/libxmount_input_raw/CMakeLists.txt @@ -6,5 +6,5 @@ project(libxmount_input_raw C) add_library(xmount_input_raw SHARED libxmount_input_raw.c ../../libxmount/libxmount.c) @@ -48,9 +97,21 @@ diff -up xmount-0.7.6/libxmount_input/libxmount_input_raw/CMakeLists.txt.suffix -install(TARGETS xmount_input_raw DESTINATION lib/xmount) +install(TARGETS xmount_input_raw DESTINATION lib${LIB_SUFFIX}/xmount) -diff -up xmount-0.7.6/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt.suffix xmount-0.7.6/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt ---- xmount-0.7.6/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt 2018-08-13 17:04:46.054822886 +0200 +diff --git a/libxmount_input/libxmount_input_vdi/CMakeLists.txt b/libxmount_input/libxmount_input_vdi/CMakeLists.txt +index e17cf26422fc..40bec3a788a8 100644 +--- a/libxmount_input/libxmount_input_vdi/CMakeLists.txt ++++ b/libxmount_input/libxmount_input_vdi/CMakeLists.txt +@@ -6,5 +6,5 @@ project(libxmount_input_vdi C) + + add_library(xmount_input_vdi SHARED libxmount_input_vdi.c ../../libxmount/libxmount.c) + +-install(TARGETS xmount_input_vdi DESTINATION lib/xmount) ++install(TARGETS xmount_input_vdi DESTINATION lib${LIB_SUFFIX}/xmount) + +diff --git a/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt b/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt +index f85ebff79fdb..2ba7123057b3 100644 +--- a/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt ++++ b/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt @@ -6,5 +6,5 @@ project(libxmount_morphing_combine C) add_library(xmount_morphing_combine SHARED libxmount_morphing_combine.c ../../libxmount/libxmount.c) @@ -58,9 +119,10 @@ diff -up xmount-0.7.6/libxmount_morphing/libxmount_morphing_combine/CMakeLists.t -install(TARGETS xmount_morphing_combine DESTINATION lib/xmount) +install(TARGETS xmount_morphing_combine DESTINATION lib${LIB_SUFFIX}/xmount) -diff -up xmount-0.7.6/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt.suffix xmount-0.7.6/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt ---- xmount-0.7.6/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt 2018-08-13 17:04:46.055822892 +0200 +diff --git a/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt b/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt +index 69e976a5072c..3f07b819720c 100644 +--- a/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt ++++ b/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt @@ -6,5 +6,5 @@ project(libxmount_morphing_raid C) add_library(xmount_morphing_raid SHARED libxmount_morphing_raid.c ../../libxmount/libxmount.c) @@ -68,20 +130,22 @@ diff -up xmount-0.7.6/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt. -install(TARGETS xmount_morphing_raid DESTINATION lib/xmount) +install(TARGETS xmount_morphing_raid DESTINATION lib${LIB_SUFFIX}/xmount) -diff -up xmount-0.7.6/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt.suffix xmount-0.7.6/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt ---- xmount-0.7.6/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt 2018-08-13 17:04:46.055822892 +0200 -@@ -6,5 +6,5 @@ project(libxmount_morphing_unallocated C +diff --git a/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt b/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt +index a90805f26c65..be41ea672501 100644 +--- a/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt ++++ b/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt +@@ -6,5 +6,5 @@ project(libxmount_morphing_unallocated C) add_library(xmount_morphing_unallocated SHARED libxmount_morphing_unallocated.c hfs_functions.c fat_functions.c ../../libxmount/libxmount.c) -install(TARGETS xmount_morphing_unallocated DESTINATION lib/xmount) +install(TARGETS xmount_morphing_unallocated DESTINATION lib${LIB_SUFFIX}/xmount) -diff -up xmount-0.7.6/src/CMakeLists.txt.suffix xmount-0.7.6/src/CMakeLists.txt ---- xmount-0.7.6/src/CMakeLists.txt.suffix 2018-04-05 08:09:54.000000000 +0200 -+++ xmount-0.7.6/src/CMakeLists.txt 2018-08-13 17:05:13.587979063 +0200 -@@ -9,7 +9,7 @@ endif(NOT APPLE) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 92d9b8ffa9a5..96fd71c2c95b 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -17,7 +17,7 @@ endif(CMAKE_THREAD_LIBS_INIT) set(LIBS ${LIBS} "dl") @@ -90,3 +154,6 @@ diff -up xmount-0.7.6/src/CMakeLists.txt.suffix xmount-0.7.6/src/CMakeLists.txt add_executable(xmount xmount.c md5.c ../libxmount/libxmount.c) +-- +2.51.0 + diff --git a/xmount.spec b/xmount.spec index 0cbced8..36d0790 100644 --- a/xmount.spec +++ b/xmount.spec @@ -1,14 +1,11 @@ -%undefine __cmake_in_source_build - Name: xmount -Version: 0.7.6 -Release: 18%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: A on-the-fly convert for multiple hard disk image types -# Automatically converted from old format: GPLv3+ - review is highly recommended. License: GPL-3.0-or-later -URL: https://www.pinguin.lu/index.php -Source0: https://files.pinguin.lu/%{name}-%{version}.tar.gz +URL: https://www.sits.lu/xmount +Source0: https://code.sits.lu/foss/xmount/-/archive/%{version}/xmount-%{version}.tar.bz2 Patch0: xmount-suffix.patch Patch1: xmount-cflags.patch @@ -38,16 +35,14 @@ VmWare, or alike. %prep %setup -q %patch -P0 -p1 -b .suffix -# Use std=99 on rhel7, uneeded nowadays -%if 0%{?fedora} || 0%{?rhel} > 7 %patch -P1 -p1 -b .cflags -%endif # Fix perm chmod -x src/xmount.* %build %cmake \ + -DCMAKE_C_FLAGS="%{optflags} -fno-strict-aliasing" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ %{nil} @@ -68,6 +63,9 @@ chmod -x src/xmount.* %changelog +* Thu Aug 21 2025 Nicolas Chauvet - 1.2.0-1 +- Update to 1.2.0 + * Fri Jul 25 2025 Fedora Release Engineering - 0.7.6-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 3d55bc3ae6902c0fad10c0e8168523b632ceddef Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 29 Oct 2025 17:50:08 +0000 Subject: [PATCH 10/15] Build against fuse3 --- xmount.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmount.spec b/xmount.spec index 36d0790..2f02333 100644 --- a/xmount.spec +++ b/xmount.spec @@ -1,6 +1,6 @@ Name: xmount Version: 1.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A on-the-fly convert for multiple hard disk image types License: GPL-3.0-or-later @@ -10,7 +10,7 @@ Patch0: xmount-suffix.patch Patch1: xmount-cflags.patch BuildRequires: gcc-c++ -BuildRequires: fuse-devel +BuildRequires: fuse3-devel BuildRequires: libewf-devel BuildRequires: afflib-devel BuildRequires: zlib-devel @@ -63,6 +63,9 @@ chmod -x src/xmount.* %changelog +* Wed Oct 29 2025 Peter Robinson - 1.2.0-2 +- Build against fuse3 + * Thu Aug 21 2025 Nicolas Chauvet - 1.2.0-1 - Update to 1.2.0 From 0dae6b07b86040aec66f7d12800c8683e5961b0e Mon Sep 17 00:00:00 2001 From: Michal Ambroz Date: Thu, 30 Oct 2025 09:42:25 +0100 Subject: [PATCH 11/15] switch to autochangelog --- changelog | 129 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..561107e --- /dev/null +++ b/changelog @@ -0,0 +1,129 @@ +* Wed Oct 29 2025 Peter Robinson - 1.2.0-2 +- Build against fuse3 + +* Thu Aug 21 2025 Nicolas Chauvet - 1.2.0-1 +- Update to 1.2.0 + +* Fri Jul 25 2025 Fedora Release Engineering - 0.7.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 0.7.6-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 25 2024 Miroslav Suchý - 0.7.6-16 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 0.7.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 0.7.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 0.7.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.7.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.7.6-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.7.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 0.7.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Fedora Release Engineering - 0.7.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 0.7.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 0.7.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 0.7.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 0.7.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Aug 13 2018 Nicolas Chauvet - 0.7.6-3 +- Fix build down to epel7 +- Add missing hook +- Better space handling + +* Sat Jul 14 2018 Fedora Release Engineering - 0.7.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 18 2018 Fabian Affolter - 0.7.6-1 +- Update to new upstream version 0.7.6 (rhbz#1316252) + +* Fri Feb 09 2018 Fedora Release Engineering - 0.7.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 0.7.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.7.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 0.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Sat Apr 02 2016 Fabian Affolter - 0.7.3-1 +- Update to new upstream version 0.7.3 (rhbz#1316252) + +* Fri Feb 05 2016 Fedora Release Engineering - 0.6.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 0.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Aug 19 2014 Michal Ambroz - 0.6.0-4 +- enable build with newer ewf library + +* Mon Aug 18 2014 Fedora Release Engineering - 0.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sun Jun 08 2014 Fedora Release Engineering - 0.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Jun 05 2014 Fabian Affolter - 0.6.0-1 +- Update to new upstream version 0.6.0 + +* Sun Aug 04 2013 Fedora Release Engineering - 0.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Mar 01 2013 Nicolas Chauvet - 0.5.0-4 +- Rebuilt for libewf + +* Fri Feb 15 2013 Fedora Release Engineering - 0.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Sep 02 2012 Fabian Affolter - 0.5.0-2 +- Clean section remove +- BR update + +* Mon Aug 06 2012 Fabian Affolter - 0.5.0-1 +- Add a provide +- Permissions were fixed upstream +- Update to new upstream version 0.5.0 + +* Sat Jun 30 2012 Fabian Affolter - 0.4.7-2 +- Leave md5 implementation in place + +* Fri Apr 13 2012 Fabian Affolter - 0.4.7-1 +- Update to new upstream version 0.4.7 + +* Tue Oct 18 2011 Fabian Affolter - 0.4.6-1 +- Update to new upstream version 0.4.6 + +* Wed Sep 01 2010 Fabian Affolter - 0.4.2-2 +- Add patch from #606073 +- Fix permission +- Add needed BRs + +* Mon Mar 15 2010 Fabian Affolter - 0.4.2-1 +- Initial package for Fedora From 0849183e767411e43f400d8e1364b8a0a9f234d7 Mon Sep 17 00:00:00 2001 From: Michal Ambroz Date: Thu, 30 Oct 2025 09:42:48 +0100 Subject: [PATCH 12/15] switch to autochangelog --- xmount.spec | 132 +--------------------------------------------------- 1 file changed, 2 insertions(+), 130 deletions(-) diff --git a/xmount.spec b/xmount.spec index 2f02333..f70b240 100644 --- a/xmount.spec +++ b/xmount.spec @@ -1,6 +1,6 @@ Name: xmount Version: 1.2.0 -Release: 2%{?dist} +Release: %autorelease Summary: A on-the-fly convert for multiple hard disk image types License: GPL-3.0-or-later @@ -63,132 +63,4 @@ chmod -x src/xmount.* %changelog -* Wed Oct 29 2025 Peter Robinson - 1.2.0-2 -- Build against fuse3 - -* Thu Aug 21 2025 Nicolas Chauvet - 1.2.0-1 -- Update to 1.2.0 - -* Fri Jul 25 2025 Fedora Release Engineering - 0.7.6-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 0.7.6-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 25 2024 Miroslav Suchý - 0.7.6-16 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 0.7.6-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 0.7.6-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 0.7.6-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 0.7.6-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 0.7.6-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.7.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.7.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 0.7.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.7.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 0.7.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 0.7.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 0.7.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Aug 13 2018 Nicolas Chauvet - 0.7.6-3 -- Fix build down to epel7 -- Add missing hook -- Better space handling - -* Sat Jul 14 2018 Fedora Release Engineering - 0.7.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Mon Jun 18 2018 Fabian Affolter - 0.7.6-1 -- Update to new upstream version 0.7.6 (rhbz#1316252) - -* Fri Feb 09 2018 Fedora Release Engineering - 0.7.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 0.7.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0.7.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0.7.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sat Apr 02 2016 Fabian Affolter - 0.7.3-1 -- Update to new upstream version 0.7.3 (rhbz#1316252) - -* Fri Feb 05 2016 Fedora Release Engineering - 0.6.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 0.6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Aug 19 2014 Michal Ambroz - 0.6.0-4 -- enable build with newer ewf library - -* Mon Aug 18 2014 Fedora Release Engineering - 0.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sun Jun 08 2014 Fedora Release Engineering - 0.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Jun 05 2014 Fabian Affolter - 0.6.0-1 -- Update to new upstream version 0.6.0 - -* Sun Aug 04 2013 Fedora Release Engineering - 0.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Fri Mar 01 2013 Nicolas Chauvet - 0.5.0-4 -- Rebuilt for libewf - -* Fri Feb 15 2013 Fedora Release Engineering - 0.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Sep 02 2012 Fabian Affolter - 0.5.0-2 -- Clean section remove -- BR update - -* Mon Aug 06 2012 Fabian Affolter - 0.5.0-1 -- Add a provide -- Permissions were fixed upstream -- Update to new upstream version 0.5.0 - -* Sat Jun 30 2012 Fabian Affolter - 0.4.7-2 -- Leave md5 implementation in place - -* Fri Apr 13 2012 Fabian Affolter - 0.4.7-1 -- Update to new upstream version 0.4.7 - -* Tue Oct 18 2011 Fabian Affolter - 0.4.6-1 -- Update to new upstream version 0.4.6 - -* Wed Sep 01 2010 Fabian Affolter - 0.4.2-2 -- Add patch from #606073 -- Fix permission -- Add needed BRs - -* Mon Mar 15 2010 Fabian Affolter - 0.4.2-1 -- Initial package for Fedora +%autochangelog From 221dfd2eda770a814144931709a59ea48d036060 Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Tue, 4 Nov 2025 16:51:22 -0500 Subject: [PATCH 13/15] rebuild for new fuse3 From 6f235776e6af419f64c095c98a0eb93b15c304da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:47:12 +0000 Subject: [PATCH 14/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 235b770a7df4b7f42e94f131d3429ce07a9e3a2c Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Wed, 15 Jul 2026 23:25:58 -0300 Subject: [PATCH 15/15] update to 1.3.1 Signed-off-by: Filipe Rosset --- sources | 2 +- xmount-cflags.patch | 25 ++++++------------------- xmount-suffix.patch | 7 +++++++ xmount.spec | 14 ++++++-------- 4 files changed, 20 insertions(+), 28 deletions(-) diff --git a/sources b/sources index c9ea5a7..311135f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xmount-1.2.0.tar.bz2) = 7df2974eae84f22fc30d4971fe4f5d4e3b3fc1698703fc75b206777a06d2c3708e8d4f1c95f8c1c259ded2e99895ab5f8d35b583a3966b250ceb4f3029793575 +SHA512 (xmount-1.3.1.tar.bz2) = 630c37b521b37b5c238bb451fdfdf98c3fa28b7ef4456cf1e54f0ce4774b24d2dc32a40a7f1201178877259c55acd504289bfa9d94f11f60cbb24911912edeec diff --git a/xmount-cflags.patch b/xmount-cflags.patch index 1218517..f618f0a 100644 --- a/xmount-cflags.patch +++ b/xmount-cflags.patch @@ -1,27 +1,14 @@ -From 7ea54293aea783e88545662d807bb5efc527d58d Mon Sep 17 00:00:00 2001 -From: Nicolas Chauvet -Date: Tue, 26 Aug 2025 11:10:25 +0200 -Subject: [PATCH 2/2] Drop C_FLAGS tweaks - -Signed-off-by: Nicolas Chauvet ---- - CMakeLists.txt | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7369014065b5..e0064598f406 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -87,9 +87,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) +--- a/CMakeLists.txt 2026-07-15 22:56:57.947212529 -0300 ++++ b/CMakeLists.txt 2026-07-15 22:56:59.937211558 -0300 +@@ -87,11 +87,6 @@ add_definitions(-D_LARGEFILE64_SOURCE) add_definitions(-D_FILE_OFFSET_BITS=64) add_definitions(-D_GNU_SOURCE) --set(CMAKE_C_FLAGS "-fno-strict-aliasing -std=c99 -Wall") +-if(NOT CMAKE_C_FLAGS) +- set(CMAKE_C_FLAGS "-fno-strict-aliasing -std=c99 -Wall") +-endif(NOT CMAKE_C_FLAGS) -set(CMAKE_C_FLAGS_RELEASE "-O2 ${CMAKE_C_FLAGS}") -set(CMAKE_C_FLAGS_DEBUG "-ggdb -O0 ${CMAKE_C_FLAGS}") # Compile stuff in sub dirs add_subdirectory(libxmount_input) --- -2.51.0 - diff --git a/xmount-suffix.patch b/xmount-suffix.patch index 3d0814a..db1bd65 100644 --- a/xmount-suffix.patch +++ b/xmount-suffix.patch @@ -154,6 +154,13 @@ index 92d9b8ffa9a5..96fd71c2c95b 100644 add_executable(xmount xmount.c md5.c ../libxmount/libxmount.c) +diff --git a/libxmount_morphing/libxmount_morphing_byteswap/CMakeLists.txt b/libxmount_morphing/libxmount_morphing_byteswap/CMakeLists.txt +--- a/libxmount_morphing/libxmount_morphing_byteswap/CMakeLists.txt ++++ b/libxmount_morphing/libxmount_morphing_byteswap/CMakeLists.txt +@@ -9,1 +9,1 @@ +-install(TARGETS xmount_morphing_byteswap DESTINATION lib/xmount) ++install(TARGETS xmount_morphing_byteswap DESTINATION lib${LIB_SUFFIX}/xmount) + -- 2.51.0 diff --git a/xmount.spec b/xmount.spec index f70b240..7212e8d 100644 --- a/xmount.spec +++ b/xmount.spec @@ -1,5 +1,5 @@ Name: xmount -Version: 1.2.0 +Version: 1.3.1 Release: %autorelease Summary: A on-the-fly convert for multiple hard disk image types @@ -9,12 +9,12 @@ Source0: https://code.sits.lu/foss/xmount/-/archive/%{version}/xmount-%{v Patch0: xmount-suffix.patch Patch1: xmount-cflags.patch -BuildRequires: gcc-c++ -BuildRequires: fuse3-devel -BuildRequires: libewf-devel BuildRequires: afflib-devel -BuildRequires: zlib-devel BuildRequires: cmake +BuildRequires: fuse3-devel +BuildRequires: gcc-c++ +BuildRequires: libewf-devel +BuildRequires: zlib-devel Provides: bundled(md5-deutsch) @@ -33,9 +33,7 @@ VmWare, or alike. %prep -%setup -q -%patch -P0 -p1 -b .suffix -%patch -P1 -p1 -b .cflags +%autosetup -p1 # Fix perm chmod -x src/xmount.*