Update to 20.1

This commit is contained in:
Tomas Hrnciar 2020-04-29 13:50:31 +02:00 committed by churchyard
commit 0e2a444500
2 changed files with 10 additions and 2 deletions

View file

@ -4,7 +4,6 @@
%global srcname pip
%global base_version 20.1
%global prerel b1
%global upstream_version %{base_version}%{?prerel}
%global python_wheelname %{srcname}-%{upstream_version}-py2.py3-none-any.whl
%global python_wheeldir %{_datadir}/python-wheels
@ -205,6 +204,12 @@ Recommends: python%{python3_pkgversion}-setuptools
Provides: pip = %{version}-%{release}
Conflicts: python-pip < %{version}-%{release}
# %%pyX_install_wheel and %%pyproject_install was adapted to workaround PEP 610 handling in pip 20.1+
# (This explicit conflict can be removed after we update to Python 3.9)
Conflicts: python-rpm-macros < 3.8-4
Conflicts: python3-rpm-macros < 3.8-4
Conflicts: pyproject-rpm-macros < 0-15
%{crypt_compat_recommends 3}
%description -n python%{python3_pkgversion}-%{srcname}
@ -389,6 +394,9 @@ ln -sf %{buildroot}%{_bindir}/pip3 _bin/pip
%{python_wheeldir}/%{python_wheelname}
%changelog
* Wed Apr 29 2020 Tomas Hrnciar <thrnciar@redhat.com> - 20.1-1
- Update to 20.1
* Mon Apr 27 2020 Tomas Hrnciar <thrnciar@redhat.com> - 20.1~b1-1
- Update to 20.1~b1