diff --git a/SOURCES/dummy-certifi.patch b/SOURCES/dummy-certifi.patch new file mode 100644 index 0000000..f6a9f35 --- /dev/null +++ b/SOURCES/dummy-certifi.patch @@ -0,0 +1,15 @@ +diff --git a/pip/_vendor/certifi/core.py b/pip/_vendor/certifi/core.py +index eab9d1d..9614a88 100644 +--- a/pip/_vendor/certifi/core.py ++++ b/pip/_vendor/certifi/core.py +@@ -19,9 +19,7 @@ class DeprecatedBundleWarning(DeprecationWarning): + + + def where(): +- f = os.path.dirname(__file__) +- +- return os.path.join(f, 'cacert.pem') ++ return '/etc/pki/tls/certs/ca-bundle.crt' + + + def old_where(): diff --git a/SPECS/python2-pip.spec b/SPECS/python2-pip.spec index 359f520..0ba033b 100644 --- a/SPECS/python2-pip.spec +++ b/SPECS/python2-pip.spec @@ -4,6 +4,7 @@ %global srcname pip %global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl +%global python2_wheeldir %{_datadir}/python2-wheels %if %{without bootstrap} %global python2_wheelname %python_wheelname %endif @@ -18,7 +19,7 @@ Name: python2-%{srcname} # When updating, update the bundled libraries versions bellow! Version: 9.0.3 -Release: 13%{?dist} +Release: 15%{?dist} Summary: A tool for installing and managing Python 2 packages Group: Development/Libraries @@ -81,6 +82,10 @@ Patch1: emit-a-warning-when-running-with-root-privileges.patch # Fedora bug: https://bugzilla.redhat.com/show_bug.cgi?id=1573755 Patch3: pip-nowarn-upgrade.patch +# Use the system level root certificate instead of the one bundled in certifi +# https://bugzilla.redhat.com/show_bug.cgi?id=1655253 +Patch4: dummy-certifi.patch + BuildRequires: python2-devel BuildRequires: python2-setuptools %if %{with tests} @@ -142,6 +147,33 @@ A documentation for a tool for installing and managing Python packages %endif +%if %{without bootstrap} +%package -n python2-pip-wheel +Summary: The pip wheel + +# Virtual provides for the packages bundled by pip. +# You can find the versions in pip/_vendor/vendor.txt file. +Provides: bundled(python2dist(appdirs)) = 1.4.0 +Provides: bundled(python2dist(cachecontrol)) = 0.11.7 +Provides: bundled(python2dist(colorama)) = 0.3.7 +Provides: bundled(python2dist(distlib)) = 0.2.4 +Provides: bundled(python2dist(distro)) = 1.0.1 +Provides: bundled(python2dist(html5lib)) = 1.0b10 +Provides: bundled(python2dist(ipaddress) = 1.0.17 +Provides: bundled(python2dist(lockfile)) = 0.12.2 +Provides: bundled(python2dist(packaging)) = 16.8 +Provides: bundled(python2dist(setuptools)) = 28.8.0 +Provides: bundled(python2dist(progress)) = 1.2 +Provides: bundled(python2dist(pyparsing)) = 2.1.10 +Provides: bundled(python2dist(requests)) = 2.11.1 +Provides: bundled(python2dist(retrying)) = 1.3.3 +Provides: bundled(python2dist(six)) = 1.10.0 +Provides: bundled(python2dist(webencodings)) = 0.5 + +%description -n python2-pip-wheel +A Python wheel of pip to use with venv. +%endif + %prep %setup -q -n %{srcname}-%{version} @@ -152,6 +184,11 @@ tar -xf %{SOURCE1} %patch0 -p1 %patch1 -p1 %patch3 -p1 +%patch4 -p1 + +# this goes together with patch4 +rm pip/_vendor/certifi/*.pem +sed -i '/\.pem$/d' pip.egg-info/SOURCES.txt sed -i '1d' pip/__init__.py @@ -228,6 +265,11 @@ mkdir -p %{buildroot}%{python2_sitelib}/pip-%{version}.dist-info echo rpm > %{buildroot}%{python2_sitelib}/pip-%{version}.dist-info/INSTALLER +%if %{without bootstrap} +mkdir -p %{buildroot}%{python2_wheeldir} +install -p dist/%{python2_wheelname} -t %{buildroot}%{python2_wheeldir} +%endif + %if %{with tests} %check export RHEL_ALLOW_PYTHON2_FOR_BUILD=1 @@ -259,7 +301,23 @@ py.test-%{python2_version} -m 'not network' %doc docs/_build/html %endif # with doc +%if %{without bootstrap} +%files -n python2-pip-wheel +%license LICENSE.txt +# we own the dir for simplicity +%dir %{python2_wheeldir}/ +%{python2_wheeldir}/%{python2_wheelname} +%endif + %changelog +* Thu Oct 24 2019 Charalampos Stratakis - 9.0.3-15 +- Use the system level root certificate instead of the one bundled in certifi +Resolves: rhbz#1659551 + +* Tue Jun 18 2019 Charalampos Stratakis - 9.0.3-14 +- Create the python-pip-wheel subpackage +Resolves: rhbz#1659551 + * Thu Apr 25 2019 Tomas Orsava - 9.0.3-13 - Bumping due to problems with modular RPM upgrade path - Resolves: rhbz#1695587