robert pushed to arj (el6). "Merge remote branch 'origin/master' into el6"

[notifications at fedoraproject.org]

>From dd57f6235e266aa3d8e6432bd0c60204a5ba95ce Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert at fedoraproject.org>
Date: Fri, 3 Apr 2015 17:56:56 +0200
Subject: - Added workaround for "Patch not found"
 (https://gnats.netbsd.org/36919) - Added workaround for "machine
 `x86_64-redhat' not recognized" from config.sub


diff --git a/arj.spec b/arj.spec
index 3e7f0d6..1840b03 100644
--- a/arj.spec
+++ b/arj.spec
@@ -56,6 +56,14 @@ popd
 
 %build
 pushd gnu
+  %if 0%{?rhel} <= 6
+  # Workaround for "Patch not found" (https://gnats.netbsd.org/36919)
+  export CFLAGS="$CFLAGS -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
   %configure
 popd
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/arj.git/commit/?h=el6&id=0591d21c4ef147e81e91493f595148cd6a4be569