From e714c8c15a2ecb34358ed7a63fff625f290174a8 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 25 Oct 2021 11:44:18 -0700 Subject: [PATCH] Cleanup spec, prepare for new macros --- epel-rpm-macros.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index ec5f75e..edd3550 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -12,11 +12,14 @@ License: GPLv2 URL: http://download.fedoraproject.org/pub/epel Source0: macros.epel-rpm-macros Source1: macros.zzz-epel-override -Source9: GPL +Source2: GPL +#Add source for misc macros below here + BuildArch: noarch Requires: redhat-release >= %{version} # For FPC buildroot macros +# Currently Recommends; Change to Requires when it is in EPEL Recommends: fpc-srpm-macros # pyproject-rpm-macros in CRB thus not required by python3-devel or python3-rpm-macros # https://bugzilla.redhat.com/show_bug.cgi?id=2001034 @@ -28,16 +31,18 @@ macros for building EPEL packages. %prep %setup -cT -install -pm 644 %{SOURCE9} . +install -pm 644 %{SOURCE2} . %install -#GPG Key +#epel rpm macros install -Dpm 644 %{SOURCE0} \ %{buildroot}%{_rpmmacrodir}/macros.epel-rpm-macros install -Dpm 644 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/rpm/macros.zzz-epel-override +#Add misc macros below here + %files %license GPL