From c27e92ab172193ce0c648d3f8b700622fea8621b Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs(a)math.uh.edu>
Date: Thu, 31 Mar 2016 18:31:15 -0500
Subject: Add ghc macros.
---
epel-rpm-macros.spec | 5 ++++-
macros.zzz-epel | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec
index da5b387..d86fbcf 100644
--- a/epel-rpm-macros.spec
+++ b/epel-rpm-macros.spec
@@ -1,6 +1,6 @@
Name: epel-rpm-macros
Version: 6
-Release: 6
+Release: 7
Summary: Extra Packages for Enterprise Linux RPM macros
Group: System Environment/Base
@@ -43,6 +43,9 @@ install -Dpm 644 %{SOURCE1} \
/etc/rpm/macros.zzz-epel-autosetup
%changelog
+* Thu Mar 31 2016 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 6-7
+- Add GHC macros moved from epel-release-6.
+
* Thu Feb 18 2016 Jason L Tibbitts III <tibbs(a)math.uh.edu> - 6-6
- Add %%epel.
- Add %%rpmmacrodir.
diff --git a/macros.zzz-epel b/macros.zzz-epel
index c8cc0b9..3147390 100644
--- a/macros.zzz-epel
+++ b/macros.zzz-epel
@@ -24,5 +24,9 @@
# Add nodejs_arches - in redhat-rpm-config in EL7
%nodejs_arches %{ix86} x86_64 %{arm}
+# Valid GHC architectures, moved from epel-release-6
+%ghc_arches %{ix86} x86_64 ppc64
+%ghc_arches_with_ghci %{ix86} x86_64
+
# Add a directory for RPM macros that can be used consistently across Fedora and EPEL
%rpmmacrodir %{_sysconfdir}/rpm
--
cgit v0.12
http://pkgs.fedoraproject.org/cgit/epel-rpm-macros.git/commit/?h=el6&...