1 file changed, 22 insertions(+), 11 deletions(-)

  diff --git a/Lib/ensurepip/__init__.py b/Lib/ensurepip/__init__.py

  --- a/Lib/ensurepip/__init__.py

  +++ b/Lib/ensurepip/__init__.py

  @@ -1,3 +1,5 @@

   import os

   import os.path

   import sys

   from importlib import resources

  -from . import _bundled

  -_SETUPTOOLS_VERSION = "49.2.1"

  +_wheels = {}

  +def _get_most_recent_wheel_version(pkg):

  +    prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg))

  +    _wheels[pkg] = {}

   _PROJECTS = [

       ("setuptools", _SETUPTOOLS_VERSION, "py3"),

           # additional paths that need added to sys.path

           additional_paths = []

           for project, version, py_tag in _PROJECTS:

  Date: Tue, 4 Aug 2020 12:04:03 +0200

  Subject: [PATCH] 00353: Original names for architectures with different names

   downstream

  https://fedoraproject.org/wiki/Changes/Python_Upstream_Architecture_Names

  upstream without this feature. It's possible to include

  Python/importlib_external.h to this patch but it'd make rebasing

  a nightmare because it's basically a binary file.

  ---

   Lib/importlib/_bootstrap_external.py | 40 ++++++++++++++++++++++++++--

   1 file changed, 38 insertions(+), 2 deletions(-)

  #  WARNING  When rebasing to a new Python version,

  #           remember to update the python3-docs package as well

  %global general_version %{pybasever}.0

  %global upstream_version %{general_version}%{?prerel}

  Version: %{general_version}%{?prerel:~%{prerel}}

  License: Python

  # See https://bugzilla.redhat.com/show_bug.cgi?id=556092

  Patch111: 00111-no-static-lib.patch

  # Instead of bundled wheels, use our RPM packaged wheels

  #

  # We keep them in /usr/share/python-wheels

  # 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 setuptools_version 49.2.1

  # 00251 # 2eabd04356402d488060bc8fe316ad13fc8a3356

  # ======================================================

  %changelog

  * Fri Sep 25 2020 Miro Hrončok <mhroncok@redhat.com> - 3.9.0~rc2-2

  - Use upstream architecture names on Fedora 34+

  - https://fedoraproject.org/wiki/Changes/Python_Upstream_Architecture_Names