From 4e27a744cad179c99697d9292fb14fb9698dcb9c Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Mon, 2 Aug 2021 09:31:55 -0700 Subject: [PATCH] Refactor to use standard macros, not hard-coded paths Signed-off-by: Michel Alexandre Salim --- epel-rpm-macros.spec | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index 007962b..80c6781 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -44,12 +44,11 @@ install -pm 644 %{SOURCE9} . %install #GPG Key -# Can't depend upon %%rpmmacrodir yet, since we're providing it install -Dpm 644 %{SOURCE0} \ - %buildroot/usr/lib/rpm/macros.d/macros.epel-rpm-macros + %{buildroot}%{_rpmmacrodir}/macros.epel-rpm-macros install -Dpm 644 %{SOURCE1} \ - %buildroot/etc/rpm/macros.zzz-epel-override + %{buildroot}%{_sysconfdir}/rpm/macros.zzz-epel-override install -Dpm 755 %{SOURCE2} \ %{buildroot}%{_rpmconfigdir}/gpgverify @@ -59,22 +58,23 @@ install -Dpm 644 %{SOURCE3} \ # misc macros install -Dpm 644 %{SOURCE150} \ - %{buildroot}/usr/lib/rpm/macros.d/macros.build-constraints + %{buildroot}%{_rpmmacrodir}/macros.build-constraints %files %license GPL -/usr/lib/rpm/macros.d/macros.epel-rpm-macros -/etc/rpm/macros.zzz-epel-override +%{_rpmmacrodir}/macros.epel-rpm-macros +%{_sysconfdir}/rpm/macros.zzz-epel-override %{_rpmconfigdir}/gpgverify %{_fileattrsdir}/pythondist.attr # misc macros -/usr/lib/rpm/macros.d/macros.build-constraints +%{_rpmmacrodir}/macros.build-constraints %changelog -* Sat Jul 24 2021 Michel Alexandre Salim - 8-23 +* Mon Aug 2 2021 Michel Alexandre Salim - 8-23 - Add macros.build-constraints +- Refactor to use standard macros, not hard-coded paths * Wed Jul 14 2021 Miro Hrončok - 8-22 - Introduce %%py3_check_import