diff --git a/zidrav-cxx11.patch b/zidrav-cxx11.patch deleted file mode 100644 index 21018bf..0000000 --- a/zidrav-cxx11.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up zidrav4unix-1.2.0/core.h.cxx11 zidrav4unix-1.2.0/core.h ---- zidrav4unix-1.2.0/core.h.cxx11 2005-05-19 22:58:40.000000000 +0200 -+++ zidrav4unix-1.2.0/core.h 2019-02-28 00:38:17.793710884 +0100 -@@ -30,7 +30,7 @@ public: - char signature[9]; - char version[3]; - -- KSigver( char sig[], char ver[] ) { -+ KSigver( const char sig[], const char ver[] ) { - strcpy( signature, sig ); - strcpy( version, ver ); - }; diff --git a/zidrav.spec b/zidrav.spec index 97e6789..5c63237 100644 --- a/zidrav.spec +++ b/zidrav.spec @@ -1,17 +1,14 @@ Summary: Zorba's Incredible Data Repairer And Verifier Name: zidrav Version: 1.2.0 -Release: 41%{?dist} -URL: https://sourceforge.net/projects/zidrav -Source: https://downloads.sourceforge.net/project/zidrav/zidrav4unix/%{version}/zidrav4unix-%{version}.tar.gz +Release: 25%{?dist} +URL: http://sourceforge.net/projects/zidrav +Source: http://switch.dl.sourceforge.net/sourceforge/zidrav/%{name}4unix-%{version}.tar.gz Patch0: %{name}-rpm.patch Patch1: %{name}-gcc43.patch Patch2: %{name}-gcc60.patch -Patch3: %{name}-cxx11.patch -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +License: GPLv2+ -BuildRequires: make BuildRequires: gcc-c++ %description ZIDRAV stands for "Zorba's Incredible Data Repairer And Verifier", and is an @@ -21,78 +18,30 @@ and then by comparing that checksum with the original file, it creates a patch file that can repair the corrupted file. Very cool, and saves re-downloading. %prep -%autosetup -n zidrav4unix-%{version} -# fix DOS line endings -tr -d '\r' zidrav.txt.cr && mv zidrav.txt.cr zidrav.txt +%setup -q -n %{name}4unix-%{version} +%patch0 -p1 -b .r +%patch1 -p1 -b .gcc43 +%patch2 -p1 %build -%set_build_flags -%ifarch ppc64 s390x -export CXXFLAGS="$CXXFLAGS -DCPU_BIGENDIAN" +CXXFLAGS="$RPM_OPT_FLAGS" +%ifarch ppc ppc64 +CXXFLAGS="$CXXFLAGS -DCPU_BIGENDIAN" %endif -%make_build CXXFLAGS="$CXXFLAGS" +%{__make} %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS" %install -%make_install +# fix DOS line endings +tr -d '\r' zidrav.txt.cr && mv zidrav.txt.cr zidrav.txt +%{__make} DESTDIR=$RPM_BUILD_ROOT install %files %doc Changelog README TODO zidrav.txt %license COPYING %{_bindir}/%{name} -%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}.* %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 1.2.0-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 1.2.0-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 1.2.0-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.2.0-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 1.2.0-37 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 1.2.0-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.2.0-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.2.0-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.2.0-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.2.0-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 1.2.0-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.2.0-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 1.2.0-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.2.0-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jan 31 2020 Fedora Release Engineering - 1.2.0-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sun Dec 01 2019 Dominik 'Rathann' Mierzejewski 1.2.0-26 -- modernize spec -- use HTTPS in URLs -- drop endianness "detection" from patch, fix on s390x -- fix code invalid in C++11 - * Sat Jul 27 2019 Fedora Release Engineering - 1.2.0-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild