diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index 5c12113..ac835f5 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -1,6 +1,6 @@ Name: epel-rpm-macros Version: 7 -Release: 7 +Release: 8 Summary: Extra Packages for Enterprise Linux RPM macros Group: System Environment/Base @@ -30,6 +30,7 @@ macros for building EPEL packages. %setup -cT install -pm 644 %{SOURCE1} . +%build %install #GPG Key install -Dpm 644 %{SOURCE0} \ @@ -41,6 +42,9 @@ install -Dpm 644 %{SOURCE0} \ %changelog +* Wed Mar 30 2016 Jason L Tibbitts III - 7-8 +- Use simpler definition of %%epel. + * Thu Feb 18 2016 Jason L Tibbitts III - 7-7 - Add mono macros requested in rhbz 1295117. diff --git a/macros.epel-rpm-macros b/macros.epel-rpm-macros index cf10d76..6cf16c7 100644 --- a/macros.epel-rpm-macros +++ b/macros.epel-rpm-macros @@ -1,8 +1,11 @@ # epel macros -%epel %{?rhel}%{!?rhel:7} +%epel 7 # Mono macros requested in rhbz 1295117 %mono_arches %{ix86} x86_64 sparc sparcv9 ia64 %{arm} alpha s390x ppc ppc64 ppc64le %_monodir %{_prefix}/lib/mono %_monogacdir %{_monodir}/gac + +# A directory for rpm macros +%rpmmacrodir /usr/lib/rpm/macros.d