From 4596d5c7ca35c30910fcc85bc8f16a0bc0715661 Mon Sep 17 00:00:00 2001 From: Charalampos Stratakis Date: May 29 2017 14:15:04 +0000 Subject: Do not exclude bundled setuptools and pip from the installation when rewheel is disabled, as this breaks virtual environments. Resolves: rhbz#1263057 --- diff --git a/python34.spec b/python34.spec index 39ac813..6fd1588 100644 --- a/python34.spec +++ b/python34.spec @@ -153,7 +153,7 @@ Summary: Version 3 of the Python programming language aka Python 3000 Name: python%{pyshortver} Version: %{pybasever}.5 -Release: 3%{?dist} +Release: 4%{?dist} License: Python Group: Development/Languages @@ -793,6 +793,11 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %if 0%{with_rewheel} Requires: python%{pyshortver}-setuptools Requires: python%{pyshortver}-pip +%else +# When rewheel is disabled we keep the bundled setuptools and pip +# so that virtualenvs work properly +Provides: bundled(python%{pyshortver}-pip) = 8.1.1 +Provides: bundled(python%{pyshortver}-setuptools) = 20.10.1 %endif %description @@ -1727,7 +1732,11 @@ rm -fr %{buildroot} %dir %{pylibdir}/ensurepip/__pycache__/ %{pylibdir}/ensurepip/*.py %{pylibdir}/ensurepip/__pycache__/*%{bytecode_suffixes} +%if 0%{?with_rewheel} %exclude %{pylibdir}/ensurepip/_bundled +%else +%{pylibdir}/ensurepip/_bundled +%endif %if 0%{?with_rewheel} %dir %{pylibdir}/ensurepip/rewheel/ @@ -1999,6 +2008,10 @@ rm -fr %{buildroot} # ====================================================== %changelog +* Mon May 29 2017 Charalampos Stratakis 3.4.5-4 +- Do not exclude bundled setuptools and pip from the installation + when rewheel is disabled(rhbz#1263057) + * Wed Nov 9 2016 Peter Robinson 3.4.5-3 - Re-enable tests on aarch64