add ghc_arches_with_ghci

We have decided to disable Thumb2 and this should have been pushed before.
Since Thumb2/ARM are compatible at the call-site level due to interworking,
we can just drop in replace existing builds with Thumb2 disabled later.

Signed-off-by: Jon Masters <jcm@jonmasters.org>

redhat-rpm-config-9.1.0-arches-macros.patch

@@ -1,9 +1,10 @@
 diff -uNr redhat-rpm-config-9.1.0-orig/macros.ghc-srpm redhat-rpm-config-9.1.0/macros.ghc-srpm
 --- redhat-rpm-config-9.1.0-orig/macros.ghc-srpm	1969-12-31 18:00:00.000000000 -0600
 +++ redhat-rpm-config-9.1.0/macros.ghc-srpm	2011-05-27 10:19:29.504287354 -0500
-@@ -0,0 +1,2 @@
+@@ -0,0 +1,3 @@
 +# macro defining the archs that ghc runs on in fedora
-+%ghc_arches %{ix86} x86_64 ppc ppc64 alpha sparcv9
++%ghc_arches %{ix86} x86_64 ppc ppc64 alpha sparcv9 armv7hl armv5tel
++%ghc_arches_with_ghci %{ix86} x86_64 ppc sparcv9
 diff -uNr redhat-rpm-config-9.1.0-orig/macros.mono-srpm redhat-rpm-config-9.1.0/macros.mono-srpm
 --- redhat-rpm-config-9.1.0-orig/macros.mono-srpm	1969-12-31 18:00:00.000000000 -0600
 +++ redhat-rpm-config-9.1.0/macros.mono-srpm	2011-05-27 10:59:00.348201750 -0500
@@ -14,7 +15,7 @@ diff -uNr redhat-rpm-config-9.1.0-orig/macros.ocaml-srpm redhat-rpm-config-9.1.0
 --- redhat-rpm-config-9.1.0-orig/macros.ocaml-srpm	1969-12-31 18:00:00.000000000 -0600
 +++ redhat-rpm-config-9.1.0/macros.ocaml-srpm	2011-05-27 10:42:10.638194240 -0500
 @@ -0,0 +1,2 @@
-+# arches that ocaml runs on 
++# arches that ocaml runs on
 +%ocaml_arches alpha %{arm} %{ix86} ia64 x86_64 ppc  sparc sparcv9 ppc64
 diff -uNr redhat-rpm-config-9.1.0-orig/Makefile redhat-rpm-config-9.1.0/Makefile
 --- redhat-rpm-config-9.1.0-orig/Makefile	2010-02-02 03:24:04.000000000 -0600

redhat-rpm-config-9.1.0-arm.patch

@@ -1,7 +1,7 @@
-diff -uNr redhat-rpm-config-9.1.0-orig/rpmrc redhat-rpm-config-9.1.0/rpmrc
---- redhat-rpm-config-9.1.0-orig/rpmrc	2010-02-02 03:24:04.000000000 -0600
-+++ redhat-rpm-config-9.1.0/rpmrc	2011-06-13 10:40:02.000000000 -0500
-@@ -46,10 +46,12 @@
+diff -urNp redhat-rpm-config-9.1.0_orig/rpmrc redhat-rpm-config-9.1.0/rpmrc
+--- redhat-rpm-config-9.1.0_orig/rpmrc	2010-02-02 04:24:04.000000000 -0500
++++ redhat-rpm-config-9.1.0/rpmrc	2011-07-02 04:29:11.921575635 -0400
+@@ -46,10 +46,12 @@ optflags: armv3l %{__global_cflags} -fsi
  optflags: armv4b %{__global_cflags} -fsigned-char -march=armv4
  optflags: armv4l %{__global_cflags} -fsigned-char -march=armv4
  optflags: armv4tl %{__global_cflags} -march=armv4t
@@ -18,9 +18,11 @@ diff -uNr redhat-rpm-config-9.1.0-orig/rpmrc redhat-rpm-config-9.1.0/rpmrc
  
  optflags: atarist %{__global_cflags}
  optflags: atariste %{__global_cflags}
-@@ -77,4 +79,5 @@
+@@ -76,5 +78,7 @@ buildarchtranslate: sparcv9v: sparcv9
+ 
  buildarchtranslate: armv5tejl: armv5tel
  buildarchtranslate: armv6l: armv5tel
  buildarchtranslate: armv7l: armv5tel
++buildarchtranslate: armv7hl: armv7hl
 +buildarchtranslate: armv7hnl: armv7hl
  

redhat-rpm-config.spec

@@ -1,11 +1,11 @@
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.1.0
-Release: 10%{?dist}
+Release: 16%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
-URL: http://git.fedoraproject.org/git/redhat-rpm-config
+URL: http://git.fedorahosted.org/git/redhat-rpm-config
 Source: redhat-rpm-config-%{version}.tar.bz2
 Patch0: redhat-rpm-config-9.1.0-strict-python-bytecompile.patch
 Patch1: redhat-rpm-config-9.1.0-fix-requires.patch
@@ -13,7 +13,7 @@ Patch2: redhat-rpm-config-9.1.0-no-strip-note.patch
 Patch3: redhat-rpm-config-9.1.0-pkgconfig-private.patch
 # the macros defined by this patch are for things that need to be defined
 # at srpm creation time when it is not feasable to require the base packages
-# that would otherwise be providing the macros. other language/arch specific 
+# that would otherwise be providing the macros. other language/arch specific
 # macros should not be defined here but instead in the base packages that can
 # be pulled in at rpm build time, this is specific for srpm creation.
 Patch4: redhat-rpm-config-9.1.0-arches-macros.patch
@@ -22,7 +22,6 @@ BuildArch: noarch
 Requires: mktemp
 Requires: rpm >= 4.6.0
 BuildRequires: libtool
-BuildRoot: %{_tmppath}/%{name}-root
 
 %description
 Red Hat specific rpm configuration files.
@@ -55,6 +54,24 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rpm/*
 
 %changelog
+* Fri Jan 20 2012 Jens Petersen <petersen@redhat.com> - 9.1.0-16
+- add ghc_arches_with_ghci
+
+* Tue Oct 18 2011 Jens Petersen <petersen@redhat.com> - 9.1.0-15
+- add armv5tel to ghc_arches
+- fix URL (Ville Skyttä)
+
+* Thu Oct  6 2011 Jens Petersen <petersen@redhat.com> - 9.1.0-14
+- add armv7hl to ghc_arches
+
+* Mon Sep 19 2011 Jon Masters <jcm@redhat.com> - 9.1.0-13
+- rework a patch we had been sitting on to fix F15 ARM hardfp bootstrap
+- redhat-rpm-config-9.1.0-arm.patch: do NOT make armv7hl default on v7
+- redhat-rpm-config-9.1.0-arm.patch: disable Thumb on v7hl systems
+
+* Sat Jul 02 2011 Jon Masters <jcm@jonmasters.org> - 9.1.0-12
+- redhat-rpm-config-9.1.0-arm.patch: Make armv7hl default on all v7 ARM
+
 * Tue Jun 21 2011 Jens Petersen <petersen@redhat.com> - 9.1.0-10
 - revert last build since releng prefers exclusivearch here