diff --git a/macros.python2 b/macros.python2 index d6c74c2..395aee0 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 + +# use the non-underscored macros to refer to Python in spec, etc. +%python2 %__python2 + %python2_sitelib %(%{__python2} -Esc "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %python2_sitearch %(%{__python2} -Esc "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") %python2_version %(%{__python2} -Esc "import sys; sys.stdout.write('{0.major}.{0.minor}'.format(sys.version_info))") diff --git a/macros.python3 b/macros.python3 index 25c6f62..af486e8 100644 --- a/macros.python3 +++ b/macros.python3 @@ -1,4 +1,9 @@ +# use the underscored macros to redefine the behavior of %%python3_version etc. %__python3 /usr/bin/python3 + +# use the non-underscored macros to refer to Python in spec, etc. +%python3 %__python3 + %python3_sitelib %(%{__python3} -Ic "from distutils.sysconfig import get_python_lib; print(get_python_lib())") %python3_sitearch %(%{__python3} -Ic "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") %python3_version %(%{__python3} -Ic "import sys; sys.stdout.write(sys.version[:3])") diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index e3d2d85..a2a775f 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 37%{?dist} +Release: 38%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -71,6 +71,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ %changelog +* Fri Sep 27 2019 Miro Hrončok - 3-38 +- Define %%python2 and %%python3 + * Wed Aug 15 2018 Miro Hrončok - 3-37 - Make %%py_byte_compile terminate build on SyntaxErrors (#1616219)