- updated to 65.3.0, usable bootstrap bcond

diff --git a/multilib.patch b/multilib.patch
index e843f6559579decc1cbe5bfea9d1c230a5ec83b9..993a87cce63060b53fae6298dc499771d9da0c33 100644 (file)
--- a/multilib.patch
+++ b/multilib.patch
@@ -1,6 +1,6 @@
---- setuptools-62.0.0/setuptools/_distutils/sysconfig.py.orig  2022-04-26 23:24:21.684034857 +0200
-+++ setuptools-62.0.0/setuptools/_distutils/sysconfig.py       2022-04-26 23:24:40.750464254 +0200
-@@ -170,13 +170,13 @@
+--- setuptools-65.3.0/setuptools/_distutils/sysconfig.py.orig  2022-08-31 15:40:59.444208654 +0200
++++ setuptools-65.3.0/setuptools/_distutils/sysconfig.py       2022-08-31 15:42:02.547200129 +0200
+@@ -237,13 +237,13 @@ def get_python_lib(plat_specific=0, stan
              prefix = plat_specific and EXEC_PREFIX or PREFIX
  
      if os.name == "posix":
@@ -14,5 +14,5 @@
 -            libdir = "lib"
 +            libdir = "share"
          implementation = 'pypy' if IS_PYPY else 'python'
-         libpython = os.path.join(prefix, libdir,
-                                  implementation + get_python_version())
+         libpython = os.path.join(prefix, libdir, implementation + get_python_version())
+         return _posix_lib(standard_lib, libpython, early_prefix, prefix)

diff --git a/python3-setuptools.spec b/python3-setuptools.spec
index df9b78e686205748d4bbd3e491f6462cad67be2d..b790e85dc6a0d6b4c48a98aca89836de63170c0d 100644 (file)
--- a/python3-setuptools.spec
+++ b/python3-setuptools.spec
@@ -1,9 +1,9 @@
 #
 # Conditional build:
 %bcond_with    apidocs         # Sphinx based documentation
-%bcond_with    system_libs     # use system modules (appdirs, packaging, pyparsing) # TODO
+%bcond_with    system_libs     # use system modules (appdirs, jaraco.text, packaging, pyparsing...) # TODO
 %bcond_with    tests           # py.test tests (few failures)
-%bcond_with    bootstrap       # convenience alias for without: apidocs,system_libs,tests
+%bcond_with    bootstrap       # no system modules, bootstrap egg-info without system setuptools
 
 %if %{with bootstrap}
 %undefine      with_apidocs
@@ -16,76 +16,103 @@
 Summary:       A collection of enhancements to the Python distutils
 Summary(pl.UTF-8):     Zestaw rozszerzeń dla pythonowych distutils
 Name:          python3-setuptools
-Version:       62.0.0
-Release:       2
+Version:       65.3.0
+Release:       1
 Epoch:         1
 License:       MIT
 Group:         Development/Languages/Python
 #Source0Download: https://pypi.org/simple/setuptools/
 Source0:       https://github.com/pypa/setuptools/archive/v%{version}/%{pypi_name}-%{version}.tar.gz
-# Source0-md5: 7f932b83c8c74751a2f1e60cd569189b
+# Source0-md5: 5f9edb9878237788e08cda599aa012c7
 Patch0:                setuptools-missing.patch
 Patch1:                multilib.patch
 URL:           https://github.com/pypa/setuptools
 %if %(locale -a | grep -q '^C\.utf8$'; echo $?)
 BuildRequires: glibc-localedb-all
 %endif
-BuildRequires: python3-modules >= 1:3.6
+BuildRequires: python3-modules >= 1:3.7
+%{!?with_bootstrap:BuildRequires:      python3-setuptools >= 1:54}
 %if %{with system_libs}
-# versions from pkg_resources/_vendor/vendored.txt
+# versions from pkg_resources/_vendor/vendored.txt and setuptools/_vendor/vendored.txt
 BuildRequires: python3-appdirs >= 1.4.3
-BuildRequires: python3-packaging >= 20.4
-BuildRequires: python3-pyparsing >= 2.2.1
+BuildRequires: python3-importlib_metadata >= 4.11.1
+BuildRequires: python3-importlib_resources >= 5.4.0
+BuildRequires: python3-jaraco.text >= 3.7.0
+BuildRequires: python3-ordered-set >= 3.1.1
+BuildRequires: python3-more_itertools >= 8.8.0
+BuildRequires: python3-packaging >= 21.3
+BuildRequires: python3-pyparsing >= 3.0.9
+BuildRequires: python3-tomli >= 2.0.1
+BuildRequires: python3-typing_extensions >= 4.0.1
+BuildRequires: python3-zipp >= 3.7.0
 %endif
 BuildConflicts:        python3-distribute < 0.7
 %if %{with tests}
 BuildRequires: python3-Sphinx
+BuildRequires: python3-build
 BuildRequires: python3-coverage >= 4.5.1
+BuildRequires: python3-filelock >= 3.4.0
 BuildRequires: python3-flake8-2020
-BuildRequires: python3-jaraco.envs
+BuildRequires: python3-ini2toml >= 0.9
+BuildRequires: python3-jaraco.envs >= 2.2
 BuildRequires: python3-jaraco.path >= 3.2.0
 # FIXME: patch to use unittest.mock
 #BuildRequires:        python3-mock
 BuildRequires: python3-paver
 BuildRequires: python3-pip >= 19.1
-BuildRequires: python3-pytest >= 4.6
+BuildRequires: python3-pip_run >= 8.8
+BuildRequires: python3-pytest >= 6
 BuildRequires: python3-pytest-black >= 0.3.7
 BuildRequires: python3-pytest-checkdocs >= 2.4
 BuildRequires: python3-pytest-cov >= 2.5.1
-BuildRequires: python3-pytest-enabler >= 1.0.1
+BuildRequires: python3-pytest-enabler >= 1.3
 BuildRequires: python3-pytest-flake8
-BuildRequires: python3-pytest-mypy
-BuildRequires: python3-pytest-virtualenv >= 1.2.7
+BuildRequires: python3-pytest-flake8-2020
+BuildRequires: python3-pytest-mypy >= 0.9.1
+BuildRequires: python3-pytest-perf
 BuildRequires: python3-pytest-xdist
 BuildRequires: python3-virtualenv >= 13.0.0
+BuildRequires: python3-tomli
+BuildRequires: python3-tomli-w >= 1.0.0
 BuildRequires: python3-wheel
 %endif
 %if %{with apidocs}
 BuildRequires: python3-Sphinx
 BuildRequires: python3-furo
 BuildRequires: python3-jaraco
-BuildRequires: python3-jaraco.packaging >= 8.2
-BuildRequires: python3-jaraco.tidelift
+BuildRequires: python3-jaraco.packaging >= 9
+BuildRequires: python3-jaraco.tidelift >= 1.4
+BuildRequires: python3-pygments-github-lexers >= 0.0.5
 BuildRequires: python3-rst.linker >= 1.9
 # specified but not required(?)
 #BuildRequires:        python3-pygments-github-lexers >= 0.0.5
 BuildRequires: python3-setuptools >= 1:34
+BuildRequires: python3-sphinx-hoverxref
+BuildRequires: python3-sphinx-notfound-page >= 0.8.3
+BuildRequires: python3-sphinx-reredirects
 BuildRequires: python3-sphinx_favicon
 BuildRequires: python3-sphinx_inline_tabs
 BuildRequires: python3-sphinxcontrib-towncrier
 BuildRequires: python3-toml
-BuildRequires: python3-wheel
 %endif
 %{!?with_bootstrap:BuildRequires:      rpm-pythonprov}
 BuildRequires: rpmbuild(macros) >= 1.714
 BuildRequires: unzip
 BuildConflicts:        python3-setuptools_scm
-Requires:      python3-modules >= 1:3.6
+Requires:      python3-modules >= 1:3.7
 %if %{with system_libs}
-# versions from pkg_resources/_vendor/vendored.txt
+# versions from pkg_resources/_vendor/vendored.txt and setuptools/_vendor/vendored.txt
 Requires:      python3-appdirs >= 1.4.3
-Requires:      python3-packaging >= 20.4
-Requires:      python3-pyparsing >= 2.2.1
+Requires:      python3-importlib_metadata >= 4.11.1
+Requires:      python3-importlib_resources >= 5.4.0
+Requires:      python3-jaraco.text >= 3.7.0
+Requires:      python3-ordered-set >= 3.1.1
+Requires:      python3-more_itertools >= 8.8.0
+Requires:      python3-packaging >= 21.3
+Requires:      python3-pyparsing >= 3.0.9
+Requires:      python3-tomli >= 2.0.1
+Requires:      python3-typing_extensions >= 4.0.1
+Requires:      python3-zipp >= 3.7.0
 %endif
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -125,6 +152,10 @@ exit 1 # TODO: unvendor modules from pkg_resources/_vendor
 %endif
 
 %build
+%if %{with bootstrap}
+%{__python3} setup.py egg_info
+%endif
+
 LC_ALL=C.UTF-8 \
 %py3_build