From a59818afd063ffaafc724b94f9e6a6a8a6530831 Mon Sep 17 00:00:00 2001 From: Michal Cyprian Date: Mar 03 2017 12:52:35 +0000 Subject: Revert "Switch %%__python3 to /usr/libexec/system-python" - The Fedora Change https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe was postponed - This reverts commit d019d2fd4d07081a598b9d3e45d839665adab85e --- diff --git a/macros.python3 b/macros.python3 index 500af18..2805b8a 100644 --- a/macros.python3 +++ b/macros.python3 @@ -1,5 +1,4 @@ -%__python3 /usr/libexec/system-python -%__python3_bin /usr/bin/python3 +%__python3 /usr/bin/python3 %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))") %python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])") @@ -11,7 +10,7 @@ # Use the slashes after expand so that the command starts on the same line as # the macro %py3_build() %{expand:\\\ - CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3_bin} %{py3_shbang_opts}" %{?*} + CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3} %{py3_shbang_opts}" %{?*} sleep 1 } @@ -26,7 +25,7 @@ } %py3_install() %{expand:\\\ - CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} --executable="%{__python3_bin} %{py3_shbang_opts}" %{?*} + CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?*} } %py3_install_egg() %{expand:\\\ @@ -35,5 +34,5 @@ } %py3_install_wheel() %{expand:\\\ - pip%{python3_version} install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --prefix %{_prefix} --no-deps + pip%{python3_version} install -I dist/%{1} --root %{buildroot} --strip-file-prefix %{buildroot} --no-deps } diff --git a/python-rpm-macros.spec b/python-rpm-macros.spec index 65bef6b..ac986fa 100644 --- a/python-rpm-macros.spec +++ b/python-rpm-macros.spec @@ -1,6 +1,6 @@ Name: python-rpm-macros Version: 3 -Release: 19%{?dist} +Release: 20%{?dist} Summary: The unversioned Python RPM macros License: MIT @@ -69,6 +69,11 @@ install -m 644 %{SOURCE0} %{SOURCE1} %{SOURCE2} %{SOURCE3} \ %changelog +* Fri Mar 03 2017 Michal Cyprian - 3-20 +- Revert "Switch %%__python3 to /usr/libexec/system-python" + after the Fedora Change https://fedoraproject.org/wiki/Changes/Making_sudo_pip_safe + was postponed + * Fri Feb 17 2017 Michal Cyprian - 3-19 - Switch %%__python3 to /usr/libexec/system-python