From cf94d87026ab5a2975546c681447f56747cad0a0 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Mar 16 2023 09:41:58 +0000
Subject: Bootstrap re-order: Build setuptools --with bootstrap with python3-rpm-generators


The generators only need packaging and packaging only needs flit.core.

We can now build:

 0. python-rpm-macros bumped to 3.N
 1. python3.N --with bootstrap ...
 2. python-flit --with bootstrap
 3. python-packaging --with bootstrap
 4. python-setuptools --with bootstrap (already using the generators at this point)
 5. ...

---

diff --git a/python-setuptools.spec b/python-setuptools.spec
index 65b234d..fa865c8 100644
--- a/python-setuptools.spec
+++ b/python-setuptools.spec
@@ -50,14 +50,15 @@ BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  gcc
 %endif
 
-%if %{without bootstrap}
-BuildRequires:  pyproject-rpm-macros >= 0-44
-# Not to use the pre-generated egg-info, we use setuptools from previous build to generate it
-BuildRequires:  python%{python3_pkgversion}-setuptools
 # python3 bootstrap: this is built before the final build of python3, which
 # adds the dependency on python3-rpm-generators, so we require it manually
 # The minimal version is for bundled provides verification script to accept multiple files as input
 BuildRequires:  python3-rpm-generators >= 12-8
+
+%if %{without bootstrap}
+BuildRequires:  pyproject-rpm-macros >= 0-44
+# Not to use the pre-generated egg-info, we use setuptools from previous build to generate it
+BuildRequires:  python%{python3_pkgversion}-setuptools
 %endif
 
 %description
@@ -89,11 +90,6 @@ Provides: bundled(python%{python3_pkgversion}dist(tomli)) = 2.0.1
 Summary:        Easily build and distribute Python 3 packages
 %{bundled}
 
-%if %{with bootstrap}
-Provides:       python%{python3_pkgversion}dist(setuptools) = %{version}
-Provides:       python%{python3_version}dist(setuptools) = %{version}
-%endif
-
 # For users who might see ModuleNotFoundError: No module named 'pkg_resoureces'
 # NB: Those are two different provides: one contains underscore, the other hyphen
 %py_provides    python%{python3_pkgversion}-pkg_resources
@@ -173,20 +169,18 @@ install -p %{_pyproject_wheeldir}/%{python_wheel_name} -t %{buildroot}%{python_w
 
 
 %check
-%if %{without bootstrap}
 # Verify bundled provides are up to date
 %{_rpmconfigdir}/pythonbundles.py */_vendor/vendored.txt --namespace 'python%{python3_pkgversion}dist' --compare-with '%{bundled}'
 
-# Regression test, the wheel should not be larger than 900 kB
-# https://bugzilla.redhat.com/show_bug.cgi?id=1914481#c3
-test $(stat --format %%s %{_pyproject_wheeldir}/%{python_wheel_name}) -lt 900000
-%endif
-
 # Regression test, the tests are not supposed to be installed
 test ! -d %{buildroot}%{python3_sitelib}/pkg_resources/tests
 test ! -d %{buildroot}%{python3_sitelib}/setuptools/tests
 
 %if %{without bootstrap}
+# Regression test, the wheel should not be larger than 900 kB
+# https://bugzilla.redhat.com/show_bug.cgi?id=1914481#c3
+test $(stat --format %%s %{_pyproject_wheeldir}/%{python_wheel_name}) -lt 900000
+
 %pyproject_check_import
 %endif