From 3e2fed4717ca2219d16dae745873354ba569086c Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sep 28 2011 00:57:24 +0000 Subject: add armv7hl to ghc_arches --- 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 000f7f8..2174edb 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: 19%{?dist} +Release: 20%{?dist} # No version specified. License: GPL+ Group: Development/System @@ -21,7 +21,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 @@ -69,6 +69,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_sysconfdir}/rpm/* %changelog +* Wed Sep 28 2011 Jens Petersen - 9.1.0-20 +- add armv7hl to ghc_arches + * Sun Sep 25 2011 Ville Skyttä - 9.1.0-19 - Fix URL.