From 027856a21d4bfda59e6784f4c6b37c1257b6d6f1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 11 Jan 2022 13:30:09 -0500 Subject: [PATCH] import python3.9-3.9.9-2.el9 --- SPECS/python3.9.spec | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/SPECS/python3.9.spec b/SPECS/python3.9.spec index f200ffa..d9d7c2d 100644 --- a/SPECS/python3.9.spec +++ b/SPECS/python3.9.spec @@ -17,7 +17,7 @@ URL: https://www.python.org/ #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 1%{?dist} +Release: 2%{?dist} License: Python @@ -268,8 +268,8 @@ BuildRequires: /usr/bin/dtrace BuildRequires: /usr/sbin/ifconfig %if %{with rpmwheels} -BuildRequires: python-setuptools-wheel -BuildRequires: python-pip-wheel +BuildRequires: %{python_wheel_pkg_prefix}-setuptools-wheel >= 53.0.0-7 +BuildRequires: %{python_wheel_pkg_prefix}-pip-wheel >= 21.2.3-4 %endif %if %{without bootstrap} @@ -522,8 +522,8 @@ This package contains /usr/bin/python - the "python" command that runs Python 3. Summary: Python runtime libraries %if %{with rpmwheels} -Requires: python-setuptools-wheel -Requires: python-pip-wheel +Requires: %{python_wheel_pkg_prefix}-setuptools-wheel >= 53.0.0-7 +Requires: %{python_wheel_pkg_prefix}-pip-wheel >= 21.2.3-4 %else Provides: bundled(python3dist(pip)) = %{pip_version} Provides: bundled(python3dist(setuptools)) = %{setuptools_version} @@ -731,8 +731,8 @@ Provides: python%{pyshortver} = %{version}-%{release} Obsoletes: python%{pyshortver} < %{version}-%{release} %if %{with rpmwheels} -Requires: python-setuptools-wheel -Requires: python-pip-wheel +Requires: %{python_wheel_pkg_prefix}-setuptools-wheel >= 53.0.0-7 +Requires: %{python_wheel_pkg_prefix}-pip-wheel >= 21.2.3-4 %else Provides: bundled(python3dist(pip)) = %{pip_version} Provides: bundled(python3dist(setuptools)) = %{setuptools_version} @@ -793,6 +793,10 @@ sed -i configure.ac \ -e 's/\b%{platform_triplet_upstream}\b/%{platform_triplet_legacy}/' %endif +# Modify ensurepip, patched by `00189-use-rpm-wheels.patch`, to insert the +# actual %%python_wheel_dir location +sed -i Lib/ensurepip/__init__.py -e 's|_WHEEL_DIR = "/usr/share/python-wheels/"|_WHEEL_DIR = "%{python_wheel_dir}/"|' + # ====================================================== # Configuring and building the code: @@ -1786,6 +1790,11 @@ CheckPython optimized # ====================================================== %changelog +* Mon Nov 22 2021 Tomas Orsava - 3.9.9-2 +- Read pre-packaged Python wheels from a newly versioned directory + /usr/share/python3-wheels +- Resolves: rhbz#1982668 + * Tue Nov 16 2021 Tomáš Hrnčiar - 3.9.9-1 - Update to 3.9.9 Resolves: rhbz#2024322