From cf8051e7f5ec584c857c86e23e5f4a38c2a27350 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 17 Jun 2019 15:33:25 +0200 Subject: [PATCH] Make %__python /usr/bin/python once again until we are ready See https://src.fedoraproject.org/rpms/python-rpm-macros/pull-request/22#comment-26552 and further. --- macros.python-srpm | 5 +++-- python-rpm-macros.spec | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/macros.python-srpm b/macros.python-srpm index f25189b..fb960ea 100644 --- a/macros.python-srpm +++ b/macros.python-srpm @@ -5,8 +5,9 @@ %__python2 /usr/bin/python2 %__python3 /usr/bin/python3 -# This now errors unless redefined to user provided value -%__python %{error:attempt to use unversioned python, define %%__python to /usr/bin/python2 or /usr/bin/python3 explicitly} +# For backwards compatibility only +# See the comments in https://src.fedoraproject.org/rpms/python-rpm-macros/pull-request/22 +%__python /usr/bin/python # python3_pkgversion specifies the version of Python 3 in the distro. It can be diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index c47f6de..170092b 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 43%{?dist} +Release: 44%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -73,6 +73,9 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \ %changelog +* Mon Jun 17 2019 Miro Hrončok - 3-44 +- Make %%__python /usr/bin/python once again until we are ready + * Mon Jun 10 2019 Miro Hrončok - 3-43 - Define %%python_sitelib, %%python_sitearch, %%python_version, %%python_version_nodots, in rpm 4.15 those are no longer defined, the meaning of python is derived from %%__python.