Make the python-pip-wheel subpackage versioned (python3-pip-wheel)

.. and move its contents to a versioned directory /usr/share/python3-wheels

Resolves: rhbz#1982668
This commit is contained in:
Tomas Orsava 2021-09-22 13:42:14 +02:00
parent d58b0e240f
commit 268d5805e2

View File

@ -15,14 +15,13 @@
%global srcname pip %global srcname pip
%global base_version 21.2.3 %global base_version 21.2.3
%global upstream_version %{base_version}%{?prerel} %global upstream_version %{base_version}%{?prerel}
%global python_wheelname %{srcname}-%{upstream_version}-py3-none-any.whl %global python_wheel_name %{srcname}-%{upstream_version}-py3-none-any.whl
%global python_wheeldir %{_datadir}/python-wheels
%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null) %global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)
Name: python-%{srcname} Name: python-%{srcname}
Version: %{base_version}%{?prerel:~%{prerel}} Version: %{base_version}%{?prerel:~%{prerel}}
Release: 3%{?dist} Release: 4%{?dist}
Summary: A tool for installing and managing Python packages Summary: A tool for installing and managing Python packages
# We bundle a lot of libraries with pip, which itself is under MIT license. # We bundle a lot of libraries with pip, which itself is under MIT license.
@ -228,16 +227,18 @@ A documentation for a tool for installing and managing Python packages
%endif %endif
%package wheel %package -n %{python_wheel_pkg_prefix}-%{srcname}-wheel
Summary: The pip wheel Summary: The pip wheel
Requires: ca-certificates Requires: ca-certificates
Provides: %{name}-wheel = %{version}-%{release}
Obsoletes: %{name}-wheel < %{version}-%{release}
# Virtual provides for the packages bundled by pip: # Virtual provides for the packages bundled by pip:
%{bundled 3} %{bundled 3}
%{crypt_compat_recommends 3} %{crypt_compat_recommends 3}
%description wheel %description -n %{python_wheel_pkg_prefix}-%{srcname}-wheel
A Python wheel of pip to use with venv. A Python wheel of pip to use with venv.
%prep %prep
@ -254,7 +255,7 @@ sed -i '/html_theme = "furo"/d' docs/html/conf.py
sed -i '/"sphinxcontrib.towncrier",/d' docs/html/conf.py sed -i '/"sphinxcontrib.towncrier",/d' docs/html/conf.py
# tests expect wheels in here # tests expect wheels in here
ln -s %{python_wheeldir} tests/data/common_wheels ln -s %{python_wheel_dir} tests/data/common_wheels
# Remove shebang from files in bundled chardet # Remove shebang from files in bundled chardet
grep -lr "^#\!/usr/bin/env python" src/pip/_vendor/chardet/ | xargs sed -i "1d" grep -lr "^#\!/usr/bin/env python" src/pip/_vendor/chardet/ | xargs sed -i "1d"
@ -280,7 +281,7 @@ rm -rf docs/build/html/{.doctrees,.buildinfo}
# /usr/bin/pip yet, so we install using the wheel directly. # /usr/bin/pip yet, so we install using the wheel directly.
# (This is not standard wheel usage, but the pip wheel supports it -- see # (This is not standard wheel usage, but the pip wheel supports it -- see
# pip/__main__.py) # pip/__main__.py)
%{python3} dist/%{python_wheelname}/pip install \ %{python3} dist/%{python_wheel_name}/pip install \
--root %{buildroot} \ --root %{buildroot} \
--no-deps \ --no-deps \
--disable-pip-version-check \ --disable-pip-version-check \
@ -331,8 +332,8 @@ ln -s ./pip-%{python3_version} %{buildroot}%{_bindir}/pip-3
echo rpm > %{buildroot}%{python3_sitelib}/pip-%{upstream_version}.dist-info/INSTALLER echo rpm > %{buildroot}%{python3_sitelib}/pip-%{upstream_version}.dist-info/INSTALLER
rm %{buildroot}%{python3_sitelib}/pip-%{upstream_version}.dist-info/RECORD rm %{buildroot}%{python3_sitelib}/pip-%{upstream_version}.dist-info/RECORD
mkdir -p %{buildroot}%{python_wheeldir} mkdir -p %{buildroot}%{python_wheel_dir}
install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir} install -p dist/%{python_wheel_name} -t %{buildroot}%{python_wheel_dir}
%if %{with tests} %if %{with tests}
@ -390,13 +391,18 @@ pytest_k='not completion and
%doc docs/build/html %doc docs/build/html
%endif %endif
%files wheel %files -n %{python_wheel_pkg_prefix}-%{srcname}-wheel
%license LICENSE.txt %license LICENSE.txt
# we own the dir for simplicity # we own the dir for simplicity
%dir %{python_wheeldir}/ %dir %{python_wheel_dir}/
%{python_wheeldir}/%{python_wheelname} %{python_wheel_dir}/%{python_wheel_name}
%changelog %changelog
* Wed Sep 22 2021 Tomas Orsava <torsava@redhat.com> - 21.2.3-4
- Make the python-pip-wheel subpackage versioned (python3-pip-wheel),
and move its contents to a versioned directory /usr/share/python3-wheels
- Resolves: rhbz#1982668
* Wed Oct 06 2021 Charalampos Stratakis <cstratak@redhat.com> - 21.2.3-3 * Wed Oct 06 2021 Charalampos Stratakis <cstratak@redhat.com> - 21.2.3-3
- Remove bundled windows executables - Remove bundled windows executables
- Resolves: rhbz#2006795 - Resolves: rhbz#2006795