From e3a3547725b0814657fe6d1bf1371855a430a4e1 Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Tue, 29 Jun 2021 08:07:05 +0200 Subject: [PATCH] Update to 3.9.6 Related: rhbz#1950291 --- 00111-no-static-lib.patch | 2 +- 00189-use-rpm-wheels.patch | 4 ++-- 00353-architecture-names-upstream-downstream.patch | 2 +- python3.9.spec | 12 ++++++++---- sources | 4 ++-- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/00111-no-static-lib.patch b/00111-no-static-lib.patch index b44dbc9..4693bbe 100644 --- a/00111-no-static-lib.patch +++ b/00111-no-static-lib.patch @@ -21,7 +21,7 @@ Co-authored-by: Miro Hrončok 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0c3981c132..5587422ec7 100644 +index 2b68571031..c57fc9693a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -589,7 +589,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c diff --git a/00189-use-rpm-wheels.patch b/00189-use-rpm-wheels.patch index 608d265..87358d9 100644 --- a/00189-use-rpm-wheels.patch +++ b/00189-use-rpm-wheels.patch @@ -12,7 +12,7 @@ We might eventually pursuit upstream support, but it's low prio 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py -index 57e576d1a3..5bd16a6c59 100644 +index 14a39037e0..5bd16a6c59 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -1,3 +1,5 @@ @@ -36,7 +36,7 @@ index 57e576d1a3..5bd16a6c59 100644 -_SETUPTOOLS_VERSION = "56.0.0" +_wheels = {} --_PIP_VERSION = "21.1.1" +-_PIP_VERSION = "21.1.3" +def _get_most_recent_wheel_version(pkg): + prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg)) + _wheels[pkg] = {} diff --git a/00353-architecture-names-upstream-downstream.patch b/00353-architecture-names-upstream-downstream.patch index 5e98140..578e786 100644 --- a/00353-architecture-names-upstream-downstream.patch +++ b/00353-architecture-names-upstream-downstream.patch @@ -34,7 +34,7 @@ Co-authored-by: Miro Hrončok 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index 7c4157369d..c3b95638a6 100644 +index fe31f437da..b5b70757f0 100644 --- a/Lib/importlib/_bootstrap_external.py +++ b/Lib/importlib/_bootstrap_external.py @@ -1636,7 +1636,7 @@ def _get_supported_file_loaders(): diff --git a/python3.9.spec b/python3.9.spec index e724590..5e4703b 100644 --- a/python3.9.spec +++ b/python3.9.spec @@ -13,11 +13,11 @@ URL: https://www.python.org/ # WARNING When rebasing to a new Python version, # remember to update the python3-docs package as well -%global general_version %{pybasever}.5 +%global general_version %{pybasever}.6 #global prerel ... %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 6%{?dist} +Release: 1%{?dist} License: Python @@ -313,7 +313,7 @@ Patch1: 00001-rpath.patch # See https://bugzilla.redhat.com/show_bug.cgi?id=556092 Patch111: 00111-no-static-lib.patch -# 00189 # 4cb983ce1c5ef32068ca9349203a6f1ef9667451 +# 00189 # 4242864a6a12f1f4cf9fd63a6699a73f35261aa3 # Instead of bundled wheels, use our RPM packaged wheels # # We keep them in /usr/share/python-wheels @@ -325,7 +325,7 @@ Patch189: 00189-use-rpm-wheels.patch # The versions are written in Lib/ensurepip/__init__.py, this patch removes them. # When the bundled setuptools/pip wheel is updated, the patch no longer applies cleanly. # In such cases, the patch needs to be amended and the versions updated here: -%global pip_version 21.1.1 +%global pip_version 21.1.3 %global setuptools_version 56.0.0 # 00251 # 2eabd04356402d488060bc8fe316ad13fc8a3356 @@ -1772,6 +1772,10 @@ CheckPython optimized # ====================================================== %changelog +* Tue Jun 29 2021 Tomas Hrnciar - 3.9.6-1 +- Update to 3.9.6 +Related: rhbz#1950291 + * Tue Jun 15 2021 Mohan Boddu - 3.9.5-6 - Rebuilt for RHEL 9 BETA for openssl 3.0 Related: rhbz#1971065 diff --git a/sources b/sources index 373c745..ca8aa55 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.9.5.tar.xz) = 7b581af1b3e73695f124ff6a3a960e22104153a5d920ca930c046f42ea313b1e7ec77e39876db2bf5d5da6d7412cb072ff8ae7814dda12c14f9da6c570fb0995 -SHA512 (Python-3.9.5.tar.xz.asc) = cfee8c161447544d6f18c3490b96ce12c8df5e9b143fca09734066f3606abe767cd7b4d05315c691f41c0e565d9585456774c10770ffe2ef7983a911bbcfdb83 +SHA512 (Python-3.9.6.tar.xz) = 01c529e3207738d8771caeb5ed6217e10745c21aa39832fe3185e1c87fdb6aedead97ce38dbb11e02d873654028bd8071c3f345c18452769520723284efe9dc1 +SHA512 (Python-3.9.6.tar.xz.asc) = 0673c8833f302c829bfde97453c52744f6aa99b4a72520f4cc384d4aa9d6ffd28a1407ceafb0a1ec4462b3aa74b656bf39c67872c4e6a131429ea58c47ad0ecc