Make the pip/setuptools version macros importpatches-compatible
This commit is contained in:
parent
25de62e067
commit
aee14b5c6b
1 changed files with 7 additions and 3 deletions
|
|
@ -76,9 +76,7 @@ License: Python-2.0.1 AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC A
|
|||
%endif
|
||||
|
||||
# If the rpmwheels condition is disabled, we use the bundled wheel packages
|
||||
# from Python with the versions below.
|
||||
%global pip_version 23.0.1
|
||||
%global setuptools_version 79.0.1
|
||||
# from Python with the versions defined near patch 189.
|
||||
# All of those also include a list of indirect bundled libs:
|
||||
# pip
|
||||
# $ %%{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/ensurepip/_bundled/pip-*.whl pip/_vendor/vendor.txt)
|
||||
|
|
@ -433,6 +431,12 @@ Patch111: 00111-no-static-lib.patch
|
|||
# Downstream only: upstream bundles
|
||||
# We might eventually pursuit upstream support, but it's low prio
|
||||
Patch189: 00189-use-rpm-wheels.patch
|
||||
# The following versions of setuptools/pip are bundled when this patch is not applied.
|
||||
# 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 23.0.1
|
||||
%global setuptools_version 79.0.1
|
||||
|
||||
# 00251 # 1b1047c14ff98eae6d355b4aac4df3e388813f62
|
||||
# Change user install location
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue