[epel-release/el6] add /etc/rpm/macros.ghc-srpm from fedora redhat-rpm-macros
Dennis Gilmore
ausil at fedoraproject.org
Fri Apr 20 05:14:16 UTC 2012
commit bfb743f1aa40db07ea5c0e3718f6280cf3dedb02
Author: Dennis Gilmore <dennis at ausil.us>
Date: Fri Apr 20 00:14:12 2012 -0500
add /etc/rpm/macros.ghc-srpm from fedora redhat-rpm-macros
epel-release.spec | 11 ++++++++++-
macros.ghc-srpm | 3 +++
2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/epel-release.spec b/epel-release.spec
index 38ebe12..0cd78b7 100644
--- a/epel-release.spec
+++ b/epel-release.spec
@@ -1,6 +1,6 @@
Name: epel-release
Version: 6
-Release: 5
+Release: 6
Summary: Extra Packages for Enterprise Linux repository configuration
Group: System Environment/Base
@@ -14,6 +14,7 @@ Source0: http://download.fedora.redhat.com/pub/epel/RPM-GPG-KEY-EPEL-6
Source1: GPL
Source2: epel.repo
Source3: epel-testing.repo
+Source4: macros.ghc-srpm
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +46,10 @@ install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
install -pm 644 %{SOURCE2} %{SOURCE3} \
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
+# rpm macros for koji
+install -Dpm 644 %{SOURCE4} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.ghc-srpm
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -65,9 +70,13 @@ rm -rf $RPM_BUILD_ROOT
%doc GPL
%config(noreplace) /etc/yum.repos.d/*
/etc/pki/rpm-gpg/*
+/etc/rpm/macros.ghc-srpm
%changelog
+* Tue Jan 10 2012 Jens Petersen <petersen at redhat.com> - 6-6
+- add /etc/rpm/macros.ghc-srpm from fedora redhat-rpm-macros
+
* Tue Oct 12 2010 Michael Stahnke <stahnma at fedoraproject.org> - 6-5
- Fix bug #627611
diff --git a/macros.ghc-srpm b/macros.ghc-srpm
new file mode 100644
index 0000000..0b56a46
--- /dev/null
+++ b/macros.ghc-srpm
@@ -0,0 +1,3 @@
+# macro defining the archs that ghc runs on in epel
+%ghc_arches %{ix86} x86_64
+%ghc_arches_with_ghci %{ix86} x86_64
More information about the scm-commits
mailing list