From a8b4b21964bcfd1c4fea45c0b037e57914729b0d Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sep 16 2016 17:33:01 +0000
Subject: Override %nodejs_arches


This requires a file in /etc/rpm, since you can't guarantee the ordering
of files in /usr/lib/rpm/macros.d.

---

diff --git a/.gitignore b/.gitignore
index e69de29..2e39c71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+results_*/
diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec
index 5ec507f..200e391 100644
--- a/epel-rpm-macros.spec
+++ b/epel-rpm-macros.spec
@@ -1,6 +1,6 @@
 Name:           epel-rpm-macros
 Version:        7
-Release:        9
+Release:        10
 Summary:        Extra Packages for Enterprise Linux RPM macros
 
 Group:          System Environment/Base
@@ -11,10 +11,11 @@ License:        GPLv2
 # within this srpm.
 URL:            http://download.fedoraproject.org/pub/epel
 Source0:        macros.epel-rpm-macros
-Source1:        GPL
+Source1:        macros.zzz-epel-override
+Source9:        GPL
 
 BuildArch:      noarch
-Requires:       redhat-release >=  %{version}
+Requires:       redhat-release >= %{version}
 # For python buildroot macros
 Requires:       python-srpm-macros
 # Since the RHEL python-devel package doesn't require them, bring them in here
@@ -28,20 +29,28 @@ macros for building EPEL packages.
 
 %prep
 %setup -cT
-install -pm 644 %{SOURCE1} .
+install -pm 644 %{SOURCE9} .
 
-%build
 %install
 #GPG Key
+# Can't depend upon %%rpmmacrodir yet, since we're providing it
 install -Dpm 644 %{SOURCE0} \
-    $RPM_BUILD_ROOT/usr/lib/rpm/macros.d/macros.epel-rpm-macros
+    %buildroot/usr/lib/rpm/macros.d/macros.epel-rpm-macros
+
+install -Dpm 644 %{SOURCE1} \
+    %buildroot/etc/rpm/macros-zzz-epel-override
 
 %files
 %license GPL
 /usr/lib/rpm/macros.d/macros.epel-rpm-macros
+/etc/rpm/macros-zzz-epel-override
 
 
 %changelog
+* Fri Sep 16 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 7-10
+- Add overrides file (seems that it must be in /etc/rpm) and override
+  %%nodejs_arches.
+
 * Thu Aug 11 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 7-9
 - Add %%bash_completion_dir.
 
diff --git a/macros.zzz-epel-override b/macros.zzz-epel-override
new file mode 100644
index 0000000..359e595
--- /dev/null
+++ b/macros.zzz-epel-override
@@ -0,0 +1,8 @@
+# This file is used _only_ to override macros which exist in RHEL.
+# It should be used very sparingly.
+
+# Override %nodejs_arches.
+# EPEL is providing nodejs on 64-bit ARM now, so the existing Red Hat provided
+# macro needs to be extended to include aarch64.
+# Requested by pbrobinson and sgallagh on IRC, 2016-09-16.
+%nodejs_arches      %{ix86} x86_64 %{arm} aarch64
diff --git a/rpmlint.cf b/rpmlint.cf
new file mode 100644
index 0000000..557f414
--- /dev/null
+++ b/rpmlint.cf
@@ -0,0 +1 @@
+addFilter("no-%build-section")