Update to 3.9.5

Related: rhbz#1950291
2021-05-04 13:07:49 +00:00 · 2021-05-04 13:07:49 +00:00 · 24e9be4681
parent 4beef0c6b0
commit 24e9be4681
5 changed files with 21 additions and 18 deletions
--- a/00111-no-static-lib.patch
+++ b/00111-no-static-lib.patch
@ -21,10 +21,10 @@ Co-authored-by: Miro Hrončok <miro@hroncok.cz>
 1 file changed, 2 insertions(+), 19 deletions(-)

 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 3137d9306c..29571e7ebb 100644
+index 0c3981c132..5587422ec7 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -586,7 +586,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
+@@ -589,7 +589,7 @@ clinic: check-clean-src $(srcdir)/Modules/_blake2/blake2s_impl.c
 	$(PYTHON_FOR_REGEN) $(srcdir)/Tools/clinic/clinic.py --make --srcdir $(srcdir)
 
 # Build the interpreter
@ -33,7 +33,7 @@ index 3137d9306c..29571e7ebb 100644
 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/python.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
 
 platform: $(BUILDPYTHON) pybuilddir.txt
-@@ -634,12 +634,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+@@ -637,12 +637,6 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
 		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
 
@ -46,7 +46,7 @@ index 3137d9306c..29571e7ebb 100644
 libpython$(LDVERSION).so: $(LIBRARY_OBJS) $(DTRACE_OBJS)
 	if test $(INSTSONAME) != $(LDLIBRARY); then \
 		$(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM); \
-@@ -721,7 +715,7 @@ Makefile Modules/config.c: Makefile.pre \
+@@ -724,7 +718,7 @@ Makefile Modules/config.c: Makefile.pre \
 	@echo "The Makefile was updated, you may need to re-run make."
 
 
@ -55,7 +55,7 @@ index 3137d9306c..29571e7ebb 100644
 	$(LINKCC) $(PY_CORE_LDFLAGS) $(LINKFORSHARED) -o $@ Programs/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS)
 
 ############################################################################
-@@ -1632,17 +1626,6 @@ libainstall:	@DEF_MAKE_RULE@ python-config
+@@ -1652,17 +1646,6 @@ libainstall:	@DEF_MAKE_RULE@ python-config
 		else	true; \
 		fi; \
 	done
--- 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 97dfa7ea71..984e587ea0 100644
+index 57e576d1a3..5bd16a6c59 100644
 --- a/Lib/ensurepip/__init__.py
 +++ b/Lib/ensurepip/__init__.py
@@ -1,3 +1,5 @@
@ -33,10 +33,10 @@ index 97dfa7ea71..984e587ea0 100644
 
 +_WHEEL_DIR = "/usr/share/python-wheels/"
 
-_SETUPTOOLS_VERSION = "49.2.1"
+-_SETUPTOOLS_VERSION = "56.0.0"
 +_wheels = {}
 
-_PIP_VERSION = "20.2.3"
+-_PIP_VERSION = "21.1.1"
 +def _get_most_recent_wheel_version(pkg):
 +    prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))
 +    _wheels[pkg] = {}
--- a/00353-architecture-names-upstream-downstream.patch
+++ b/00353-architecture-names-upstream-downstream.patch
@ -34,10 +34,10 @@ Co-authored-by: Miro Hrončok <miro@hroncok.cz>
 1 file changed, 38 insertions(+), 2 deletions(-)

 diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py
-index 25a3f8c0e0..a2edbebc88 100644
+index 7c4157369d..c3b95638a6 100644
 --- a/Lib/importlib/_bootstrap_external.py
 +++ b/Lib/importlib/_bootstrap_external.py
-@@ -1566,7 +1566,7 @@ def _get_supported_file_loaders():
+@@ -1636,7 +1636,7 @@ def _get_supported_file_loaders():
 
     Each item is a tuple (loader, suffixes).
     """
@ -46,7 +46,7 @@ index 25a3f8c0e0..a2edbebc88 100644
     source = SourceFileLoader, SOURCE_SUFFIXES
     bytecode = SourcelessFileLoader, BYTECODE_SUFFIXES
     return [extensions, source, bytecode]
-@@ -1622,7 +1622,7 @@ def _setup(_bootstrap_module):
+@@ -1692,7 +1692,7 @@ def _setup(_bootstrap_module):
 
     # Constants
     setattr(self_module, '_relax_case', _make_relax_case())
@ -55,7 +55,7 @@ index 25a3f8c0e0..a2edbebc88 100644
     if builtin_os == 'nt':
         SOURCE_SUFFIXES.append('.pyw')
         if '_d.pyd' in EXTENSION_SUFFIXES:
-@@ -1635,3 +1635,39 @@ def _install(_bootstrap_module):
+@@ -1705,3 +1705,39 @@ def _install(_bootstrap_module):
     supported_loaders = _get_supported_file_loaders()
     sys.path_hooks.extend([FileFinder.path_hook(*supported_loaders)])
     sys.meta_path.append(PathFinder)
--- a/python3.9.spec
+++ b/python3.9.spec
@ -13,7 +13,7 @@ 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}.4
+%global general_version %{pybasever}.5
 #global prerel ...
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
@ -307,7 +307,7 @@ Patch1: 00001-rpath.patch
 # See https://bugzilla.redhat.com/show_bug.cgi?id=556092
 Patch111: 00111-no-static-lib.patch

-# 00189 # 7c07eec60735bd65bda7d8e821d34718497cba27
+# 00189 # 4cb983ce1c5ef32068ca9349203a6f1ef9667451
 # Instead of bundled wheels, use our RPM packaged wheels
 #
 # We keep them in /usr/share/python-wheels
@ -319,8 +319,8 @@ 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 20.2.3
-%global setuptools_version 49.2.1
+%global pip_version 21.1.1
+%global setuptools_version 56.0.0

 # 00251 # 2eabd04356402d488060bc8fe316ad13fc8a3356
 # Change user install location
@ -1756,6 +1756,9 @@ CheckPython optimized
 # ======================================================

 %changelog
+* Tue May 04 2021 Tomas Hrnciar <thrnciar@redhat.com> - 3.9.5-1
+- Update to 3.9.5
+
 * Fri Apr 16 2021 Lumír Balhar <lbalhar@redhat.com> - 3.9.4-1
 - Update to 3.9.4
  Related: rhbz#1950291
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (Python-3.9.4.tar.xz) = 3d8a5a38de0df6edc074d141e0b4a12b79d80439e4341cd4519218aa4bb7317be2736a17058ceec43fc987fc17ea5167c19eeafbdeef732a2f1656fe2f0f0d39
-SHA512 (Python-3.9.4.tar.xz.asc) = 9cf2909ebd178cea5a6dee9f6a8622ed91c33b943f1e7f7dcf0f7ae67f552e767393f833e9a4e1e62ff059fb265582d83a85dafefbb10df7ae3da0b73669d4cd
+SHA512 (Python-3.9.5.tar.xz) = 7b581af1b3e73695f124ff6a3a960e22104153a5d920ca930c046f42ea313b1e7ec77e39876db2bf5d5da6d7412cb072ff8ae7814dda12c14f9da6c570fb0995
+SHA512 (Python-3.9.5.tar.xz.asc) = cfee8c161447544d6f18c3490b96ce12c8df5e9b143fca09734066f3606abe767cd7b4d05315c691f41c0e565d9585456774c10770ffe2ef7983a911bbcfdb83