From dee3401a7efa5f30143526e56e222d7fdcaedac3 Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Sep 30 2019 12:35:43 +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.python2 b/macros.python2 index 66e9c5a..0a75d76 100644 --- a/macros.python2 +++ b/macros.python2 @@ -1,4 +1,9 @@ +# use the underscored macros to redefine the behavior of %%python2_version etc. %__python2 /usr/bin/python2.6 + +# use the non-underscored macros to refer to Python in spec, etc. +%python2 %__python2 + %python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") %python2_version %(%{__python2} -c "import sys; sys.stdout.write(sys.version[:3])") diff --git a/macros.python3 b/macros.python3 index 7226ccc..41345e3 100644 --- a/macros.python3 +++ b/macros.python3 @@ -1,5 +1,11 @@ +# use the underscored macros to redefine the behavior of %%python3_version etc. %__python3 /usr/bin/python3.4 + +# use the non-underscored macros to refer to Python in spec, etc. +%python3 %__python3 + #__python3_other /usr/bin/python3.5 +#python3_other %%__python3_other %python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index c4ad781..0f73e16 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 14%{?dist} +Release: 15%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -65,6 +65,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE5} \ %changelog +* Fri Sep 27 2019 Miro Hrončok - 3-15 +- Define %%python2 and %%python3 + * Wed Mar 06 2019 Carl George - 3-14 - Move macros.pybytecompile in here from python3X-devel - macros.pybytecompile: Detect Python version through sys.version_info instead