From 8fc99b69b6a76315f781f265af3833ce6bcb227c Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Jun 18 2011 07:05:16 +0000
Subject: replace ghc_archs with ghc_excluded_archs


---

diff --git a/redhat-rpm-config-9.1.0-arch-macros.patch b/redhat-rpm-config-9.1.0-arch-macros.patch
new file mode 100644
index 0000000..bb5979a
--- /dev/null
+++ b/redhat-rpm-config-9.1.0-arch-macros.patch
@@ -0,0 +1,32 @@
+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 @@
++# fedora archs on which ghc has not yet been bootstrapped
++%ghc_excluded_archs ia64 sparc64 s390 s390x %{arm}
+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
+@@ -0,0 +1,2 @@
++# archs that mono builds on
++%mono_archs %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64
+diff -uNr redhat-rpm-config-9.1.0-orig/macros.ocaml-srpm redhat-rpm-config-9.1.0/macros.ocaml-srpm
+--- 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 @@
++# archs that ocaml runs on
++%ocaml_archs 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/Makefile	2011-05-27 10:43:34.898205307 -0500
+@@ -11,7 +11,10 @@
+ install:
+ 	mkdir -p $(DESTDIR)/usr/lib/rpm/redhat
+ 	cp -pr * $(DESTDIR)/usr/lib/rpm/redhat/
++	mkdir -p $(DESTDIR)/etc/rpm
++	cp -pr macros.* $(DESTDIR)/etc/rpm/
+ 	rm -f $(DESTDIR)/usr/lib/rpm/redhat/Makefile
++	rm -f $(DESTDIR)/usr/lib/rpm/redhat/macros.*
+ 
+ tag-archive:
+ 	@git tag -a $(CVSTAG) -m "$(NAME)-$(VERSION) release"
diff --git a/redhat-rpm-config-9.1.0-arches-macros.patch b/redhat-rpm-config-9.1.0-arches-macros.patch
deleted file mode 100644
index 9732e90..0000000
--- a/redhat-rpm-config-9.1.0-arches-macros.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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 @@
-+# macro defining the archs that ghc runs on in fedora
-+%ghc_arches %{ix86} x86_64 ppc ppc64 alpha 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
-@@ -0,0 +1,2 @@
-+# arches that mono builds on
-+%mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64
-diff -uNr redhat-rpm-config-9.1.0-orig/macros.ocaml-srpm redhat-rpm-config-9.1.0/macros.ocaml-srpm
---- 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 
-+%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/Makefile	2011-05-27 10:43:34.898205307 -0500
-@@ -11,7 +11,10 @@
- install:
- 	mkdir -p $(DESTDIR)/usr/lib/rpm/redhat
- 	cp -pr * $(DESTDIR)/usr/lib/rpm/redhat/
-+	mkdir -p $(DESTDIR)/etc/rpm
-+	cp -pr macros.* $(DESTDIR)/etc/rpm/
- 	rm -f $(DESTDIR)/usr/lib/rpm/redhat/Makefile
-+	rm -f $(DESTDIR)/usr/lib/rpm/redhat/macros.*
- 
- tag-archive:
- 	@git tag -a $(CVSTAG) -m "$(NAME)-$(VERSION) release"
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index dc14118..78c9061 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.1.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -55,6 +55,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rpm/*
 
 %changelog
+* Sat Jun 18 2011 Jens Petersen <petersen@redhat.com> - 9.1.0-9
+- replace ghc_archs with ghc_excluded_archs
+
 * Mon Jun 13 2011 Dennis Gilmore <dennis@ausil.us> - 9.1.0-8
 - add arm hardware float macros, fix up armv7l