[redhat-rpm-config] add a -srpm to the arch macros so they dont conflict with the langaugae base arch macros
Dennis Gilmore
ausil at fedoraproject.org
Tue May 31 02:25:47 UTC 2011
commit 708e5ed2562f01fd065c63c31e75d5d1630373ef
Author: Dennis Gilmore <dennis at ausil.us>
Date: Mon May 30 21:25:00 2011 -0500
add a -srpm to the arch macros so they dont conflict with the langaugae
base arch macros
redhat-rpm-config-9.1.0-arches-macros.patch | 18 +++++++++---------
redhat-rpm-config.spec | 6 +++++-
2 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/redhat-rpm-config-9.1.0-arches-macros.patch b/redhat-rpm-config-9.1.0-arches-macros.patch
index b7c3591..9732e90 100644
--- a/redhat-rpm-config-9.1.0-arches-macros.patch
+++ b/redhat-rpm-config-9.1.0-arches-macros.patch
@@ -1,18 +1,18 @@
-diff -uNr redhat-rpm-config-9.1.0-orig/macros.ghc redhat-rpm-config-9.1.0/macros.ghc
---- redhat-rpm-config-9.1.0-orig/macros.ghc 1969-12-31 18:00:00.000000000 -0600
-+++ redhat-rpm-config-9.1.0/macros.ghc 2011-05-27 10:19:29.504287354 -0500
+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 redhat-rpm-config-9.1.0/macros.mono
---- redhat-rpm-config-9.1.0-orig/macros.mono 1969-12-31 18:00:00.000000000 -0600
-+++ redhat-rpm-config-9.1.0/macros.mono 2011-05-27 10:59:00.348201750 -0500
+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 redhat-rpm-config-9.1.0/macros.ocaml
---- redhat-rpm-config-9.1.0-orig/macros.ocaml 1969-12-31 18:00:00.000000000 -0600
-+++ redhat-rpm-config-9.1.0/macros.ocaml 2011-05-27 10:42:10.638194240 -0500
+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 --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 0f4ea61..52ff3f4 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: 6%{?dist}
+Release: 7%{?dist}
# No version specified.
License: GPL+
Group: Development/System
@@ -53,6 +53,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sysconfdir}/rpm/*
%changelog
+* Mon May 30 2011 Dennis Gilmore <dennis at ausil.us> - 9.1.0-7
+- add -srpm to the arches files so that the base language macros can
+- be parrallel installable with these
+
* Fri May 28 2011 Dennis Gilmore <dennis at ausil.us> - 9.1.0-6
- add some specific macros needed at srpm creation time
More information about the scm-commits
mailing list