diff --git a/.gitignore b/.gitignore index e2e264b..0f68526 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/xmount-0.5.0.tar.gz +xmount-*.tar.* 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 diff --git a/sources b/sources index 66ef04b..311135f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -939a59c528fe591c86d3d711ac898796 xmount-0.5.0.tar.gz +SHA512 (xmount-1.3.1.tar.bz2) = 630c37b521b37b5c238bb451fdfdf98c3fa28b7ef4456cf1e54f0ce4774b24d2dc32a40a7f1201178877259c55acd504289bfa9d94f11f60cbb24911912edeec diff --git a/xmount-cflags.patch b/xmount-cflags.patch new file mode 100644 index 0000000..f618f0a --- /dev/null +++ b/xmount-cflags.patch @@ -0,0 +1,14 @@ +--- 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) +-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) diff --git a/xmount-suffix.patch b/xmount-suffix.patch new file mode 100644 index 0000000..db1bd65 --- /dev/null +++ b/xmount-suffix.patch @@ -0,0 +1,166 @@ +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 ${LIBS}) + +-install(TARGETS xmount_input_aaff DESTINATION lib/xmount) ++install(TARGETS xmount_input_aaff DESTINATION lib${LIB_SUFFIX}/xmount) + +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 ${LIBS}) + +-install(TARGETS xmount_input_aewf DESTINATION lib/xmount) ++install(TARGETS xmount_input_aewf DESTINATION lib${LIB_SUFFIX}/xmount) + +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) + + 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}) + +-install(TARGETS xmount_input_ewf DESTINATION lib/xmount) ++install(TARGETS xmount_input_ewf DESTINATION lib${LIB_SUFFIX}/xmount) + +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) + +-install(TARGETS xmount_input_raw DESTINATION lib/xmount) ++install(TARGETS xmount_input_raw DESTINATION lib${LIB_SUFFIX}/xmount) + +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) + +-install(TARGETS xmount_morphing_combine DESTINATION lib/xmount) ++install(TARGETS xmount_morphing_combine DESTINATION lib${LIB_SUFFIX}/xmount) + +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) + +-install(TARGETS xmount_morphing_raid DESTINATION lib/xmount) ++install(TARGETS xmount_morphing_raid DESTINATION lib${LIB_SUFFIX}/xmount) + +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 --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") + +-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/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 2455714..7212e8d 100644 --- a/xmount.spec +++ b/xmount.spec @@ -1,16 +1,20 @@ Name: xmount -Version: 0.5.0 -Release: 2%{?dist} +Version: 1.3.1 +Release: %autorelease Summary: A on-the-fly convert for multiple hard disk image types -Group: Applications/Multimedia -License: GPLv3+ -URL: https://www.pinguin.lu/index.php -Source0: http://files.pinguin.lu/projects/%{name}-%{version}.tar.gz +License: GPL-3.0-or-later +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 -BuildRequires: fuse-devel -BuildRequires: libewf-devel BuildRequires: afflib-devel +BuildRequires: cmake +BuildRequires: fuse3-devel +BuildRequires: gcc-c++ +BuildRequires: libewf-devel +BuildRequires: zlib-devel Provides: bundled(md5-deutsch) @@ -27,44 +31,34 @@ 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 +%autosetup -p1 +# Fix perm +chmod -x src/xmount.* + %build -%configure -make %{?_smp_mflags} CFLAGS="%{optflags}" +%cmake \ + -DCMAKE_C_FLAGS="%{optflags} -fno-strict-aliasing" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + %{nil} + +%cmake_build + %install -make install DESTDIR=%{buildroot} INSTALL="install -p" +%cmake_install + %files -%doc AUTHORS ChangeLog COPYING NEWS README ROADMAP +%doc AUTHORS ChangeLog NEWS README ROADMAP TODO +%license COPYING %{_mandir}/man*/%{name}*.* %{_bindir}/%{name} +%{_libdir}/xmount + %changelog -* Sun Sep 02 2012 Fabian Affolter - 0.5.0-2 -- Clean section removed -- BR updated - -* Mon Aug 06 2012 Fabian Affolter - 0.5.0-1 -- Added a provide -- Permissions were fixed upstream -- Updated 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 -- Updated to new upstream version 0.4.7 - -* Fri Oct 18 2011 Fabian Affolter - 0.4.6-1 -- Updated to new upstream version 0.4.6 - -* Wed Sep 01 2010 Fabian Affolter - 0.4.2-2 -- Added patch from #606073 -- Fixed permission -- Added needed BRs - -* Mon Mar 15 2010 Fabian Affolter - 0.4.2-1 -- Initial package for Fedora +%autochangelog