diff --git a/TODO b/TODO index f82e0f0..5078125 100644 --- a/TODO +++ b/TODO @@ -17,6 +17,4 @@ BuildRoot: definition in EL5 %__global_ldflags in EL6 (and maybe EL5) Requires redefinition of %cmake, %cmake_kde4, %qmake_qt4 and %configure -%{nodejs_arches} for EL6 and EL5 (if nodejs is even in EL5) - %make_build for EL6 and EL5 diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index 5bb244b..9cf896b 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -1,6 +1,6 @@ Name: epel-rpm-macros Version: 6 -Release: 1 +Release: 2 Summary: Extra Packages for Enterprise Linux RPM macros Group: System Environment/Base @@ -36,5 +36,8 @@ install -Dpm 644 %{SOURCE0} \ /etc/rpm/macros.zzz-epel %changelog +* Wed Jan 13 2016 Orion Poplawski - 6-2 +- Add %%nodejs_arches + * Wed Dec 02 2015 Jason L Tibbitts III - 6-1 - Initial version for EL6, based on the spec from the EL7 package. diff --git a/macros.zzz-epel b/macros.zzz-epel index 60055f1..70f1811 100644 --- a/macros.zzz-epel +++ b/macros.zzz-epel @@ -60,3 +60,6 @@ end} \ %{-f:%{_fontconfig_templatedir}/%{-f*}} \ %{-f:%config(noreplace) %{_fontconfig_confdir}/%{-f*} \ }} %{nil} + +# Add nodejs_arches - in redhat-rpm-config in EL7 +%nodejs_arches %{ix86} x86_64 %{arm}