From 4c29421847b59218b43c267351d228f3ea4c6d81 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 28 Dec 2020 18:25:38 +0100 Subject: [PATCH] Remove support for Red Hat Enterprise Linux 6 --- arj.spec | 64 ++++++++++++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 37 deletions(-) diff --git a/arj.spec b/arj.spec index 941aacc..61ffcf0 100644 --- a/arj.spec +++ b/arj.spec @@ -1,32 +1,32 @@ -Summary: Archiver for .arj files -Name: arj -Version: 3.10.22 -Release: 33%{?dist} -License: GPL+ -URL: http://arj.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Summary: Archiver for .arj files +Name: arj +Version: 3.10.22 +Release: 33%{?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 -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 +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 %description This package is an open source version of the arj archiver. It has @@ -56,16 +56,6 @@ 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