[redhat-rpm-config/f15] add armv7hl to ghc_arches

Jens Petersen petersen at fedoraproject.org
Thu Oct 6 08:50:26 UTC 2011


commit c7ac9a71ca2869a4f9cd1af9ea2571db7e9af5db
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Oct 6 17:50:17 2011 +0900

    add armv7hl to ghc_arches

 redhat-rpm-config-9.1.0-arches-macros.patch |    4 ++--
 redhat-rpm-config.spec                      |    7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/redhat-rpm-config-9.1.0-arches-macros.patch b/redhat-rpm-config-9.1.0-arches-macros.patch
index 9732e90..85d8e8e 100644
--- a/redhat-rpm-config-9.1.0-arches-macros.patch
+++ b/redhat-rpm-config-9.1.0-arches-macros.patch
@@ -3,7 +3,7 @@ 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/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
++%ghc_arches %{ix86} x86_64 ppc ppc64 alpha sparcv9 armv7hl
 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 +14,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
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 00f85bb..dd06e32 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: 13%{?dist}
+Release: 14%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -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
@@ -55,6 +55,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rpm/*
 
 %changelog
+* Thu Oct  6 2011 Jens Petersen <petersen at redhat.com> - 9.1.0-14
+- add armv7hl to ghc_arches
+
 * Mon Sep 19 2011 Jon Masters <jcm at 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


More information about the scm-commits mailing list