From af35bb0ac96570d4842bee16a1f8432907a8ab18 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Sep 27 2019 08:02:49 +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/macros.python-srpm b/macros.python-srpm index fb960ea..78bde41 100644 --- a/macros.python-srpm +++ b/macros.python-srpm @@ -2,9 +2,15 @@ # - they can be used in Build/Requires # - they can be used in non-Python packages where requiring pythonX-devel would # be an overkill + +# use the underscored macros to redefine the behavior of %%python3_version etc. %__python2 /usr/bin/python2 %__python3 /usr/bin/python3 +# use the non-underscored macros to refer to Python in spec, etc. +%python2 %__python2 +%python3 %__python3 + # For backwards compatibility only # See the comments in https://src.fedoraproject.org/rpms/python-rpm-macros/pull-request/22 %__python /usr/bin/python diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 1355a69..4dfdf20 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 48%{?dist} +Release: 49%{?dist} Summary: The unversioned Python RPM macros # macros: MIT, compileall2.py: PSFv2 @@ -78,6 +78,9 @@ install -m 644 %{SOURCE5} \ %changelog +* Fri Sep 27 2019 Miro Hrončok - 3-49 +- Define %%python2 and %%python3 + * Mon Aug 26 2019 Miro Hrončok - 3-48 - Drop --strip-file-prefix option from %%pyX_install_wheel macros, it is not needed