[redhat-rpm-config] Revert "replace ghc_archs with ghc_excluded_archs"

Jens Petersen petersen at fedoraproject.org
Tue Jun 21 04:05:42 UTC 2011


commit 62baae777dffa4b8620cebc71de30d4e1e08a991
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Jun 21 12:58:44 2011 +0900

    Revert "replace ghc_archs with ghc_excluded_archs"
    
    This reverts commit 8fc99b69b6a76315f781f265af3833ce6bcb227c.

 ... => redhat-rpm-config-9.1.0-arches-macros.patch |   12 ++++++------
 redhat-rpm-config.spec                             |    5 +----
 2 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/redhat-rpm-config-9.1.0-arch-macros.patch b/redhat-rpm-config-9.1.0-arches-macros.patch
similarity index 81%
rename from redhat-rpm-config-9.1.0-arch-macros.patch
rename to redhat-rpm-config-9.1.0-arches-macros.patch
index bb5979a..9732e90 100644
--- a/redhat-rpm-config-9.1.0-arch-macros.patch
+++ b/redhat-rpm-config-9.1.0-arches-macros.patch
@@ -2,20 +2,20 @@ diff -uNr redhat-rpm-config-9.1.0-orig/macros.ghc-srpm redhat-rpm-config-9.1.0/m
 --- 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}
++# 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 @@
-+# archs that mono builds on
-+%mono_archs %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64
++# 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 @@
-+# archs that ocaml runs on
-+%ocaml_archs alpha %{arm} %{ix86} ia64 x86_64 ppc  sparc sparcv9 ppc64
++# 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
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 78c9061..dc14118 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: 9%{?dist}
+Release: 8%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -55,9 +55,6 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rpm/*
 
 %changelog
-* Sat Jun 18 2011 Jens Petersen <petersen at redhat.com> - 9.1.0-9
-- replace ghc_archs with ghc_excluded_archs
-
 * Mon Jun 13 2011 Dennis Gilmore <dennis at ausil.us> - 9.1.0-8
 - add arm hardware float macros, fix up armv7l
 


More information about the scm-commits mailing list