From d2bdab8bff7b8870c046bb3554670f4de8ebedfd Mon Sep 17 00:00:00 2001 From: Tomas Hrnciar Date: Dec 08 2020 14:40:26 +0000 Subject: Update to 3.8.7rc1 --- diff --git a/00102-lib64.patch b/00102-lib64.patch index b89a73f..11420ef 100644 --- a/00102-lib64.patch +++ b/00102-lib64.patch @@ -139,7 +139,7 @@ index b9e2fafbc0..0ae6d35b69 100644 'scripts': '{userbase}/bin', 'data': '{userbase}', diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py -index 01008656bd..7f9c9f1d41 100644 +index 6b3dba0f0a..4e6d9c4a65 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -267,8 +267,8 @@ class HelperFunctionsTests(unittest.TestCase): @@ -198,10 +198,10 @@ index b727f66953..a0c5fb6139 100644 return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); } diff --git a/configure b/configure -index 96dcd0dcd5..0ce1db97ac 100755 +index dfb6e7ef3f..37eef2ae8a 100755 --- a/configure +++ b/configure -@@ -15214,9 +15214,9 @@ fi +@@ -15239,9 +15239,9 @@ fi if test x$PLATFORM_TRIPLET = x; then @@ -214,10 +214,10 @@ index 96dcd0dcd5..0ce1db97ac 100755 diff --git a/configure.ac b/configure.ac -index 18a044629a..b1c80869e4 100644 +index 6c8fd5a389..4b2b51d5db 100644 --- a/configure.ac +++ b/configure.ac -@@ -4689,9 +4689,9 @@ fi +@@ -4696,9 +4696,9 @@ fi dnl define LIBPL after ABIFLAGS and LDVERSION is defined. AC_SUBST(PY_ENABLE_SHARED) if test x$PLATFORM_TRIPLET = x; then diff --git a/00189-use-rpm-wheels.patch b/00189-use-rpm-wheels.patch index 425decb..95c640a 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(+), 10 deletions(-) diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py -index 9415fd73b8..f58dab1800 100644 +index 38bb42104b..413c1b300e 100644 --- a/Lib/ensurepip/__init__.py +++ b/Lib/ensurepip/__init__.py @@ -1,6 +1,7 @@ @@ -24,7 +24,7 @@ index 9415fd73b8..f58dab1800 100644 import sys import runpy import tempfile -@@ -8,10 +9,24 @@ import tempfile +@@ -9,10 +10,24 @@ import subprocess __all__ = ["version", "bootstrap"] @@ -33,7 +33,7 @@ index 9415fd73b8..f58dab1800 100644 -_SETUPTOOLS_VERSION = "49.2.1" +_wheels = {} --_PIP_VERSION = "20.2.1" +-_PIP_VERSION = "20.2.3" +def _get_most_recent_wheel_version(pkg): + prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg)) + _wheels[pkg] = {} @@ -51,7 +51,7 @@ index 9415fd73b8..f58dab1800 100644 _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION, "py3"), -@@ -105,13 +120,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False, +@@ -102,13 +117,10 @@ def _bootstrap(*, root=None, upgrade=False, user=False, # additional paths that need added to sys.path additional_paths = [] for project, version, py_tag in _PROJECTS: diff --git a/python3.spec b/python3.spec index 3b39372..3a77dd6 100644 --- a/python3.spec +++ b/python3.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}.6 -#global prerel ... +%global general_version %{pybasever}.7 +%global prerel rc1 %global upstream_version %{general_version}%{?prerel} Version: %{general_version}%{?prerel:~%{prerel}} -Release: 2%{?dist} +Release: 1%{?dist} License: Python @@ -276,7 +276,7 @@ Patch102: 00102-lib64.patch # See https://bugzilla.redhat.com/show_bug.cgi?id=556092 Patch111: 00111-no-static-lib.patch -# 00189 # 13b857596e747720f927b7fd829aba50e79b29dd +# 00189 # 0bcd378c2e63c66291edd891fbd5a9a10c4afbdc # Instead of bundled wheels, use our RPM packaged wheels # # We keep them in /usr/share/python-wheels @@ -288,7 +288,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 20.2.1 +%global pip_version 20.2.3 %global setuptools_version 49.2.1 # 00251 # 2eabd04356402d488060bc8fe316ad13fc8a3356 @@ -1637,6 +1637,9 @@ CheckPython optimized # ====================================================== %changelog +* Tue Dec 08 2020 Tomas Hrnciar - 3.8.7~rc1-1 +- Update to 3.8.7rc1 + * Mon Oct 05 2020 Miro HronĨok - 3.8.6-2 - Use upstream architecture names on Fedora 34+ - https://fedoraproject.org/wiki/Changes/Python_Upstream_Architecture_Names diff --git a/sources b/sources index 5420b34..08e844b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (Python-3.8.6.tar.xz) = 22faec84f6e172e1ac7c6bd6fd37e9b6ae4afc91cf5136aa8cac8ebbed8d18793f9196e8749b8ccc43447cb6c41cb450f65ea72dd363c06dfaeb14e0455f5560 -SHA512 (Python-3.8.6.tar.xz.asc) = d4ed7a7360fe110b4c03d424c05f9085131f7dc457c04e6bc5bb7be29bf0ce60747fdef71ca9856c161afb1dc1bff44d2e70d4542f0f9de23667ae4a5ac63374 +SHA512 (Python-3.8.7rc1.tar.xz) = 0c42622433b968dc0943894bff6e90603bdfc4e49ab4373e2686a158e1d4b3450e60aa16d8203ce3d0e0e8bb0ebcaad281ccd7eb03b355eeeb7c811a4cd799ec +SHA512 (Python-3.8.7rc1.tar.xz.asc) = 9b0c3a2a89663c3be64def20ed03ae46139bd5588220a35d8f6689ab820a19d9ce8478ee8fcdaaf4b1ccde8c05c31738e610ab2a7fa5f63ff0c6a6e0b797cf1f