From da117b531686c73ecfcb7e2a2dec0bcc4c59e985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 2 Aug 2023 22:47:04 +0200 Subject: [PATCH] Stop Recommending libcrypt.so.1 on Python 3.12+ See https://discuss.python.org/t/29455/ --- python-pip.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/python-pip.spec b/python-pip.spec index aa6a966..9fe9cfd 100644 --- a/python-pip.spec +++ b/python-pip.spec @@ -133,6 +133,9 @@ Provides: bundled(python%{1}dist(webencodings)) = 0.5.1 # a long time until manylinux1 is phased out). # See: https://github.com/pypa/manylinux/issues/305 # 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: Recommends: (libcrypt.so.1()(64bit) if python%{1}(x86-64)) Recommends: (libcrypt.so.1 if python%{1}(x86-32)) @@ -182,9 +185,6 @@ Recommends: python%{python3_pkgversion}-setuptools Provides: pip = %{version}-%{release} Conflicts: python-pip < %{version}-%{release} - -%{crypt_compat_recommends 3} - %description -n python%{python3_pkgversion}-%{srcname} 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 @@ -212,7 +212,12 @@ Requires: ca-certificates # Virtual provides for the packages bundled by pip: %{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 A Python wheel of pip to use with venv. @@ -360,6 +365,7 @@ pytest_k='not completion' %changelog * Wed Jul 26 2023 Miro Hrončok - 23.1.2-6 - Drop no-longer-needed custom changes to /usr/bin/pip* +- Stop Recommending libcrypt.so.1 on Python 3.12+ Resolves: rhbz#2150373 * Tue Jul 25 2023 Python Maint - 23.1.2-5