diff --git a/SPECS/python-pip.spec b/SPECS/python-pip.spec index 01ff9f6..ef6d630 100644 --- a/SPECS/python-pip.spec +++ b/SPECS/python-pip.spec @@ -4,9 +4,9 @@ %bcond_without doc %global srcname pip -%global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl +%global python3_wheelname %{srcname}-%{version}-py2.py3-none-any.whl %if %{without bootstrap} -%global python3_wheelname %python_wheelname +%global python3_wheeldir %{_datadir}/python3-wheels %endif # Note that with disabled python3, bashcomp2 will be disabled as well because @@ -19,7 +19,7 @@ Name: python-%{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 packages Group: Development/Libraries @@ -174,9 +174,40 @@ A documentation for a tool for installing and managing Python packages %endif +%if %{without bootstrap} +%package -n python3-%{srcname}-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(python3dist(appdirs)) = 1.4.0 +Provides: bundled(python3dist(cachecontrol)) = 0.11.7 +Provides: bundled(python3dist(colorama)) = 0.3.7 +Provides: bundled(python3dist(distlib)) = 0.2.4 +Provides: bundled(python3dist(distro)) = 1.0.1 +Provides: bundled(python3dist(html5lib)) = 1.0b10 +Provides: bundled(python3dist(ipaddress) = 1.0.17 +Provides: bundled(python3dist(lockfile)) = 0.12.2 +Provides: bundled(python3dist(packaging)) = 16.8 +Provides: bundled(python3dist(setuptools)) = 28.8.0 +Provides: bundled(python3dist(progress)) = 1.2 +Provides: bundled(python3dist(pyparsing)) = 2.1.10 +Provides: bundled(python3dist(requests)) = 2.11.1 +Provides: bundled(python3dist(retrying)) = 1.3.3 +Provides: bundled(python3dist(six)) = 1.10.0 +Provides: bundled(python3dist(webencodings)) = 0.5 + +# Bundled within the requests bundle +Provides: bundled(python3dist(chardet)) = 2.3.0 +Provides: bundled(python3dist(urllib3)) = 1.16 + +%description -n python3-%{srcname}-wheel +A Python wheel of pip to use with venv. +%endif %prep %setup -q -n %{srcname}-%{version} + %if %{with tests} tar -xf %{SOURCE1} %endif @@ -259,6 +290,10 @@ pathfix.py -i /usr/bin/python%{python3_version} -np %{buildroot}%{_bindir}/pip%{ # (Patch3) won't work echo rpm > %{buildroot}%{python3_sitelib}/pip-%{version}.dist-info/INSTALLER +%if %{without bootstrap} +mkdir -p %{buildroot}%{python3_wheeldir} +install -p dist/%{python3_wheelname} -t %{buildroot}%{python3_wheeldir} +%endif %if %{with tests} %check @@ -273,11 +308,6 @@ py.test-%{python3_version} -m 'not network' %{_mandir}/man1/pip3.* %endif %{python3_sitelib}/pip* -%dir %{bashcompdir} -%{bashcompdir}/pip3* -%if 0%{?bashcomp2} -%dir %(dirname %{bashcompdir}) -%endif %files -n python%{python3_pkgversion}-%{srcname} %license LICENSE.txt @@ -286,6 +316,11 @@ py.test-%{python3_version} -m 'not network' # defined in the python36 package %{_bindir}/pip%{python3_version} %{_bindir}/pip-%{python3_version} +%dir %{bashcompdir} +%{bashcompdir}/pip3* +%if 0%{?bashcomp2} +%dir %(dirname %{bashcompdir}) +%endif %if %{with doc} %files doc @@ -294,7 +329,23 @@ py.test-%{python3_version} -m 'not network' %doc docs/_build/html %endif # with doc +%if %{without bootstrap} +%files -n python3-%{srcname}-wheel +%license LICENSE.txt +# we own the dir for simplicity +%dir %{python3_wheeldir}/ +%{python3_wheeldir}/%{python3_wheelname} +%endif + %changelog +* Thu Jun 06 2019 Charalampos Stratakis - 9.0.3-15 +- Create python-pip-wheel package with the wheel +Resolves: rhbz#1718031 + +* Wed Mar 13 2019 Lumír Balhar - 9.0.3-14 +- Move bash completion files from platform-python- to python3- subpackage +- resolves: rhbz#1664749 + * Mon Dec 03 2018 Miro Hrončok - 9.0.3-13 - Use the system level root certificate instead of the one bundled in certifi - Resolves: rhbz#1655255