Stop Recommending libcrypt.so.1 on Python 3.12+

See https://discuss.python.org/t/29455/
This commit is contained in:
Miro Hrončok 2023-08-02 22:47:04 +02:00
parent 960d5f25da
commit da117b5316

View File

@ -133,6 +133,9 @@ Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
# a long time until manylinux1 is phased out). # a long time until manylinux1 is phased out).
# See: https://github.com/pypa/manylinux/issues/305 # See: https://github.com/pypa/manylinux/issues/305
# Note that manylinux is only applicable to x86 (both 32 and 64 bits) # Note that manylinux is only applicable to x86 (both 32 and 64 bits)
# As of Python 3.12, we no longer use this,
# see https://discuss.python.org/t/29455/
# However, we keep it around for previous Python versions that use the wheel package.
%global crypt_compat_recommends() %{expand: %global crypt_compat_recommends() %{expand:
Recommends: (libcrypt.so.1()(64bit) if python%{1}(x86-64)) Recommends: (libcrypt.so.1()(64bit) if python%{1}(x86-64))
Recommends: (libcrypt.so.1 if python%{1}(x86-32)) Recommends: (libcrypt.so.1 if python%{1}(x86-32))
@ -182,9 +185,6 @@ Recommends: python%{python3_pkgversion}-setuptools
Provides: pip = %{version}-%{release} Provides: pip = %{version}-%{release}
Conflicts: python-pip < %{version}-%{release} Conflicts: python-pip < %{version}-%{release}
%{crypt_compat_recommends 3}
%description -n python%{python3_pkgversion}-%{srcname} %description -n python%{python3_pkgversion}-%{srcname}
pip is a package management system used to install and manage software packages pip is a package management system used to install and manage software packages
written in Python. Many packages can be found in the Python Package Index written in Python. Many packages can be found in the Python Package Index
@ -212,7 +212,12 @@ Requires: ca-certificates
# Virtual provides for the packages bundled by pip: # Virtual provides for the packages bundled by pip:
%{bundled 3} %{bundled 3}
%{crypt_compat_recommends 3} # This is only relevant for Pythons that are older than 3.12 and don't use their own bundled wheels
%{crypt_compat_recommends 3.11}
%{crypt_compat_recommends 3.10}
%{crypt_compat_recommends 3.9}
%{crypt_compat_recommends 3.8}
%{crypt_compat_recommends 3.7}
%description -n %{python_wheel_pkg_prefix}-%{srcname}-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.
@ -360,6 +365,7 @@ pytest_k='not completion'
%changelog %changelog
* Wed Jul 26 2023 Miro Hrončok <mhroncok@redhat.com> - 23.1.2-6 * Wed Jul 26 2023 Miro Hrončok <mhroncok@redhat.com> - 23.1.2-6
- Drop no-longer-needed custom changes to /usr/bin/pip* - Drop no-longer-needed custom changes to /usr/bin/pip*
- Stop Recommending libcrypt.so.1 on Python 3.12+
Resolves: rhbz#2150373 Resolves: rhbz#2150373
* Tue Jul 25 2023 Python Maint <python-maint@redhat.com> - 23.1.2-5 * Tue Jul 25 2023 Python Maint <python-maint@redhat.com> - 23.1.2-5