From 85b3df4f30a456e2e84456ce66b8f650c1e31fbb Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Sep 30 2019 12:41:53 +0000 Subject: Define %python2 and %python3 See https://pagure.io/packaging-committee/issue/907 Redefine %__pythonX to change the behavior of %pythonX, %pythonX_version, etc. Use %pythonX in spec. --- diff --git a/epel-rpm-macros.spec b/epel-rpm-macros.spec index 77ba3f8..99ddcf9 100644 --- a/epel-rpm-macros.spec +++ b/epel-rpm-macros.spec @@ -1,6 +1,6 @@ Name: epel-rpm-macros Version: 7 -Release: 21 +Release: 22 Summary: Extra Packages for Enterprise Linux RPM macros Group: System Environment/Base @@ -52,6 +52,9 @@ install -Dpm 755 %{SOURCE2} \ %changelog +* Mon Sep 30 2019 Miro Hrončok - 7-22 +- Define %%python2 and %%python3 + * Sun Aug 11 2019 Miro Hrončok - 7-21 - Move %%python3_other_pkgversion from python-srpm-macros - Redefine %%python3_pkgversion to backwards compatible value diff --git a/macros.epel-rpm-macros b/macros.epel-rpm-macros index 1ca145f..d79a593 100644 --- a/macros.epel-rpm-macros +++ b/macros.epel-rpm-macros @@ -58,3 +58,7 @@ # This was defined in python-srpm-macros # But it is not since that package got moved to RHEL 7.7+ %python3_other_pkgversion 34 + +# Use the non-underscored Python macros to refer to Python in spec, etc. +%python2 %__python2 +%python3 %__python3