diff --git a/arj.spec b/arj.spec index bb53c28..910036c 100644 --- a/arj.spec +++ b/arj.spec @@ -1,32 +1,31 @@ -Summary: Archiver for .arj files -Name: arj -Version: 3.10.22 -Release: 45%{?dist} -License: GPL-2.0-or-later -URL: https://arj.sourceforge.net/ -Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Summary: Archiver for .arj files +Name: arj +Version: 3.10.22 +Release: 30%{?dist} +License: GPL+ +URL: http://arj.sourceforge.net/ +Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # unarj.* from Debian -Source1: unarj.sh -Source2: unarj.1 -Patch0: arj-3.10.22-arches_align.patch -Patch1: arj-3.10.22-no_remove_static_const.patch -Patch2: arj-3.10.22-64_bit_clean.patch -Patch3: arj-3.10.22-parallel_build.patch -Patch4: arj-3.10.22-use_safe_strcpy.patch -Patch5: arj-3.10.22-doc_refer_robert_k_jung.patch -Patch6: arj-3.10.22-security_format.patch -Patch7: arj-3.10.22-missing-protos.patch -Patch8: arj-3.10.22-custom-printf.patch +Source1: unarj.sh +Source2: unarj.1 +Patch0: arj-3.10.22-arches_align.patch +Patch1: arj-3.10.22-no_remove_static_const.patch +Patch2: arj-3.10.22-64_bit_clean.patch +Patch3: arj-3.10.22-parallel_build.patch +Patch4: arj-3.10.22-use_safe_strcpy.patch +Patch5: arj-3.10.22-doc_refer_robert_k_jung.patch +Patch6: arj-3.10.22-security_format.patch +Patch7: arj-3.10.22-missing-protos.patch +Patch8: arj-3.10.22-custom-printf.patch # Filed into upstream bugtracker as https://sourceforge.net/tracker/?func=detail&aid=2853421&group_id=49820&atid=457566 -Patch9: arj-3.10.22-quotes.patch +Patch9: arj-3.10.22-quotes.patch Patch10: arj-3.10.22-security-afl.patch Patch11: arj-3.10.22-security-traversal-dir.patch Patch12: arj-3.10.22-security-traversal-symlink.patch BuildRequires: gcc -BuildRequires: autoconf -BuildRequires: make -Provides: unarj = %{version}-%{release} -Obsoletes: unarj < 3 +BuildRequires: autoconf +Provides: unarj = %{version}-%{release} +Obsoletes: unarj < 3 %description This package is an open source version of the arj archiver. It has @@ -36,19 +35,19 @@ Software, Inc. %prep %setup -q -%patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P3 -p1 -%patch -P4 -p1 -%patch -P5 -p1 -%patch -P6 -p1 -%patch -P7 -p1 -%patch -P8 -p1 -%patch -P9 -p1 -%patch -P10 -p1 -%patch -P11 -p1 -%patch -P12 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 pushd gnu autoconf @@ -56,14 +55,25 @@ popd %build pushd gnu + %if 0%{?rhel} + %if 0%{?rhel} <= 6 + # Workaround for "Patch not found" (https://gnats.netbsd.org/36919) + export CFLAGS="$RPM_OPT_FLAGS -fno-unit-at-a-time" + %endif + %if 0%{?rhel} == 6 + # Workaround for "machine `x86_64-redhat' not recognized" from config.sub + cp -pf /usr/lib/rpm/redhat/config.{guess,sub} . + %endif + %endif %configure popd # Disable binary strippings -%make_build ADD_LDFLAGS="" +make %{?_smp_mflags} ADD_LDFLAGS="" %install -%make_install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install install -D -p -m 644 resource/rearj.cfg.example $RPM_BUILD_ROOT%{_sysconfdir}/rearj.cfg install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/unarj @@ -74,59 +84,15 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/arj-register rm -f $RPM_BUILD_ROOT%{_mandir}/man1/arj-register.1* %files +%{!?_licensedir:%global license %%doc} %license doc/COPYING %doc ChangeLog* doc/rev_hist.txt %config(noreplace) %{_sysconfdir}/rearj.cfg %{_bindir}/*arj* %{_libdir}/arj/ -%{_mandir}/man1/*arj*.1* +%{_mandir}/man1/*arj*1.* %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 3.10.22-45 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 3.10.22-44 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 3.10.22-43 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 17 2024 Fedora Release Engineering - 3.10.22-42 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 3.10.22-41 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 3.10.22-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Jul 19 2023 Fedora Release Engineering - 3.10.22-39 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 3.10.22-38 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 3.10.22-37 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Wed Jan 19 2022 Fedora Release Engineering - 3.10.22-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Jul 21 2021 Fedora Release Engineering - 3.10.22-35 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 3.10.22-34 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 3.10.22-33 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 3.10.22-32 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 3.10.22-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - * Thu Jan 31 2019 Fedora Release Engineering - 3.10.22-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild