From 3d7226a4168399b2ff1c30ea1ef9340793dc03c6 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: May 17 2022 23:21:22 +0000 Subject: Add `Requires: ansible-srpm-macros` Backport @churchyard's packaging nitpicks from epel9 --- diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index 59663d5..71b3177 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -1,15 +1,14 @@ Name: epel-rpm-macros Version: 8 -Release: 28 +Release: 29 Summary: Extra Packages for Enterprise Linux RPM macros -Group: System Environment/Base License: GPLv2 # This is a EPEL maintained package which is specific to # our distribution. Thus the source is only available from # within this srpm. -URL: http://download.fedoraproject.org/pub/epel +URL: https://download.fedoraproject.org/pub/epel Source0: macros.epel-rpm-macros Source1: macros.zzz-epel-override Source3: pythondist.attr @@ -35,12 +34,13 @@ Requires: python-srpm-macros # Since the RHEL python-devel package doesn't require them, bring them in here Requires: python-rpm-macros Requires: python2-rpm-macros -# Make sure EPEL8's Python 3 packages use /usr/bin/python3.6 or python3.8 +# Make sure EPEL8's Python 3 packages use /usr/bin/python3.6 or python3.8 # instead of /usr/libexec/platform-python Requires: (python-modular-rpm-macros if python3-devel) Suggests: python36-rpm-macros #systemd additional macros https://pagure.io/epel/issue/77 -Requires: (epel-rpm-macros-systemd if systemd-rpm-macros) +Requires: (epel-rpm-macros-systemd if systemd-rpm-macros) +Requires: ansible-srpm-macros %description This package contains the Extra Packages for Enterprise Linux (EPEL) RPM @@ -103,6 +103,10 @@ install -Dpm 644 %{SOURCE150} \ %changelog +* Tue May 17 2022 Maxwell G - 8-29 +- Add `Requires: ansible-srpm-macros` +- Backport @churchyard's packaging nitpicks from epel9 + * Tue Mar 15 2022 Miro Hrončok - 8-28 - Remove %%gpgverify and /usr/lib/rpm/gpgverify, it is available in RHEL 8.4+