From 999ca88a38ae13c9a32b8b7def281134209fdf26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
Date: Wed, 27 Oct 2021 09:49:14 +0200
Subject: [PATCH 01/24] Update to 3.4.0

---
 .gitignore       | 1 +
 python-flit.spec | 8 ++++++--
 sources          | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9ea25b5..9e16dd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /flit-3.0.0.tar.gz
 /flit-3.2.0.tar.gz
 /flit-3.3.0.tar.gz
+/flit-3.4.0.tar.gz
diff --git a/python-flit.spec b/python-flit.spec
index 7a31e3c..73b5b1d 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -4,7 +4,7 @@
 %global srcname flit
 
 Name:		python-%{srcname}
-Version:	3.3.0
+Version:	3.4.0
 Release:	1%{?dist}
 Summary:	Simplified packaging of Python modules
 
@@ -24,13 +24,14 @@ BuildRequires:	pyproject-rpm-macros >= 0-40
 BuildRequires:	python3-pip
 
 # Runtime deps needed to build self
-BuildRequires:	python3-toml
+BuildRequires:	python3-tomli
 
 %if %{with tests}
 # Runtime deps, others
 BuildRequires:	python3-requests
 BuildRequires:	python3-docutils
 BuildRequires:	python3-pygments
+BuildRequires:	python3-tomli-w
 
 # Test deps
 BuildRequires:	/usr/bin/python
@@ -135,6 +136,9 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 
 
 %changelog
+* Tue Oct 26 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.4.0-1
+- Update to 3.4.0
+
 * Wed Aug 04 2021 Tomas Hrnciar <thrnciar@redhat.com> - 3.3.0-1
 - Update to 3.3.0
 - Fixes: rhbz#1988744
diff --git a/sources b/sources
index 248e7f4..4d484ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flit-3.3.0.tar.gz) = f0b8194a3d90607fb29b76e5de40ab72dcecd539ffd84d3d8498495dad9615e8956506077765d27dba8887076d02359eba282c77011335a654fa84b97fddc581
+SHA512 (flit-3.4.0.tar.gz) = 5793854e93f4abb477c19830d71d43dbacae89e4a1259756810e5bd91febd827efac5c6e9e8517653d000f3c9d190c409f0353e2123cab5621dc07feeccf3ed4

From 44e0a7919c67db614cd66e89cd59710100fdb8db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
Date: Mon, 29 Nov 2021 09:53:08 +0100
Subject: [PATCH 02/24] Update to 3.5.1

---
 .gitignore       | 1 +
 python-flit.spec | 5 ++++-
 sources          | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9e16dd4..5dc987f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /flit-3.2.0.tar.gz
 /flit-3.3.0.tar.gz
 /flit-3.4.0.tar.gz
+/flit-3.5.1.tar.gz
diff --git a/python-flit.spec b/python-flit.spec
index 73b5b1d..fda20ad 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -4,7 +4,7 @@
 %global srcname flit
 
 Name:		python-%{srcname}
-Version:	3.4.0
+Version:	3.5.1
 Release:	1%{?dist}
 Summary:	Simplified packaging of Python modules
 
@@ -136,6 +136,9 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 
 
 %changelog
+* Mon Nov 29 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.5.1-1
+- Update to 3.5.1
+
 * Tue Oct 26 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.4.0-1
 - Update to 3.4.0
 
diff --git a/sources b/sources
index 4d484ef..a453772 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flit-3.4.0.tar.gz) = 5793854e93f4abb477c19830d71d43dbacae89e4a1259756810e5bd91febd827efac5c6e9e8517653d000f3c9d190c409f0353e2123cab5621dc07feeccf3ed4
+SHA512 (flit-3.5.1.tar.gz) = 76a713df9a85e686b5a9516b01b02779ce9e62e5bb189724d4fb62c42324ce1607d9de334c1fa88e95a10089aebba804fac0214fcbed0c47b8fc057732d63339

From a9bec53e96315b486fc5ab36df36adc2186d856a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 21 Jan 2022 12:12:45 +0000
Subject: [PATCH 03/24] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 python-flit.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-flit.spec b/python-flit.spec
index fda20ad..b46435a 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -5,7 +5,7 @@
 
 Name:		python-%{srcname}
 Version:	3.5.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Simplified packaging of Python modules
 
 # ./flit/log.py under ASL 2.0 license
@@ -136,6 +136,9 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 
 
 %changelog
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Mon Nov 29 2021 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.5.1-1
 - Update to 3.5.1
 

From 5c8df44bbf24bce02805c345b656f6db6be50db1 Mon Sep 17 00:00:00 2001
From: Charalampos Stratakis <cstratak@redhat.com>
Date: Thu, 17 Mar 2022 01:08:56 +0100
Subject: [PATCH 04/24] Update to 3.7.1

Fixes: rhbz#2057214
---
 .gitignore       | 1 +
 python-flit.spec | 8 ++++++--
 sources          | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5dc987f..58df7ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /flit-3.3.0.tar.gz
 /flit-3.4.0.tar.gz
 /flit-3.5.1.tar.gz
+/flit-3.7.1.tar.gz
diff --git a/python-flit.spec b/python-flit.spec
index b46435a..1855880 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -4,8 +4,8 @@
 %global srcname flit
 
 Name:		python-%{srcname}
-Version:	3.5.1
-Release:	2%{?dist}
+Version:	3.7.1
+Release:	1%{?dist}
 Summary:	Simplified packaging of Python modules
 
 # ./flit/log.py under ASL 2.0 license
@@ -136,6 +136,10 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 
 
 %changelog
+* Wed Mar 16 2022 Charalampos Stratakis <cstratak@redhat.com> - 3.7.1-1
+- Update to 3.7.1
+- Fixes: rhbz#2057214
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index a453772..573f527 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flit-3.5.1.tar.gz) = 76a713df9a85e686b5a9516b01b02779ce9e62e5bb189724d4fb62c42324ce1607d9de334c1fa88e95a10089aebba804fac0214fcbed0c47b8fc057732d63339
+SHA512 (flit-3.7.1.tar.gz) = e38162696a24a0f8d9a61f3364c2ada9c8024309b02138af66c53790e14f88bf285822ea85d6634e85f88d9712eaad039bb5dcbbd1ac1f87bce6b2790bd96d6f

From 6583996484e47f79364bfe061062809be1c5f9af Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Mon, 13 Jun 2022 16:13:18 +0200
Subject: [PATCH 05/24] Bootstrap for Python 3.11

---
 python-flit.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/python-flit.spec b/python-flit.spec
index 1855880..49adfc7 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -1,3 +1,4 @@
+%global _without_tests 1
 # circular build dependency on requests-download and testpath
 %bcond_without tests
 
@@ -5,7 +6,7 @@
 
 Name:		python-%{srcname}
 Version:	3.7.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Simplified packaging of Python modules
 
 # ./flit/log.py under ASL 2.0 license
@@ -136,6 +137,9 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 
 
 %changelog
+* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.7.1-2
+- Bootstrap for Python 3.11
+
 * Wed Mar 16 2022 Charalampos Stratakis <cstratak@redhat.com> - 3.7.1-1
 - Update to 3.7.1
 - Fixes: rhbz#2057214

From c963bae5466c66fabb8dfd4e6dd88c2e369a6673 Mon Sep 17 00:00:00 2001
From: Python Maint <python-maint@redhat.com>
Date: Tue, 14 Jun 2022 16:44:34 +0200
Subject: [PATCH 06/24] Rebuilt for Python 3.11

---
 python-flit.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/python-flit.spec b/python-flit.spec
index 49adfc7..1170f74 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -1,4 +1,3 @@
-%global _without_tests 1
 # circular build dependency on requests-download and testpath
 %bcond_without tests
 
@@ -6,7 +5,7 @@
 
 Name:		python-%{srcname}
 Version:	3.7.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Simplified packaging of Python modules
 
 # ./flit/log.py under ASL 2.0 license
@@ -137,6 +136,9 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 
 
 %changelog
+* Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 3.7.1-3
+- Rebuilt for Python 3.11
+
 * Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 3.7.1-2
 - Bootstrap for Python 3.11
 

From 29a31cf080453093d75721d015112038d44c5922 Mon Sep 17 00:00:00 2001
From: Maxwell G <gotmax@e.email>
Date: Sun, 26 Jun 2022 01:34:56 -0500
Subject: [PATCH 07/24] Removed unnecessarily vendored tomli.

---
 python-flit.spec | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/python-flit.spec b/python-flit.spec
index 1170f74..1a5c583 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -5,7 +5,7 @@
 
 Name:		python-%{srcname}
 Version:	3.7.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Simplified packaging of Python modules
 
 # ./flit/log.py under ASL 2.0 license
@@ -78,6 +78,8 @@ Recommends:	python3-pygments
 Summary:	PEP 517 build backend for packages using Flit
 %{?python_provide:%python_provide python3-%{srcname}-core}
 Conflicts:	python3-%{srcname} < 2.1.0-2
+# We manually specify this, because it's bundled upstream and not in the metadata
+Requires:       python3-tomli
 
 %description -n python3-%{srcname}-core
 This provides a PEP 517 build backend for packages using Flit.
@@ -88,6 +90,15 @@ at flit_core.buildapi.
 %prep
 %autosetup -p1 -n %{srcname}-%{version}
 
+# Remove vendored tomli that flit_core includes to solve the circular dependency.
+# (flit_core requires tomli, but flit_core is needed to build tomli).
+# We don't use this, as python3-tomli already has its own bootstrap bcond
+# to build without flit_core.
+#
+# flit's tests already require tomli, so we're pulling it in at buildtime anyways.
+sed -i 's|from \.vendor import tomli|import tomli|' flit_core/flit_core/config.py
+rm -rf flit_core/flit_core/vendor
+
 %build
 export FLIT_NO_NETWORK=1
 
@@ -136,6 +147,9 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 
 
 %changelog
+* Sun Jun 26 2022 Maxwell G <gotmax@e.email> - 3.7.1-4
+- Removed unnecessarily vendored tomli.
+
 * Tue Jun 14 2022 Python Maint <python-maint@redhat.com> - 3.7.1-3
 - Rebuilt for Python 3.11
 

From 96c62fc95d0a92ab70c70b24047b3c8892e6eb97 Mon Sep 17 00:00:00 2001
From: Maxwell G <gotmax@e.email>
Date: Sun, 26 Jun 2022 11:53:19 -0500
Subject: [PATCH 08/24] Remove obsolete %python_provides

---
 python-flit.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/python-flit.spec b/python-flit.spec
index 1a5c583..9a8e4eb 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -61,7 +61,6 @@ so long as they can be imported on Python 3.}
 
 %package -n python3-%{srcname}
 Summary:	%{summary}
-%{?python_provide:%python_provide python3-%{srcname}}
 Requires:	python3-%{srcname}-core = %{version}-%{release}
 
 # https://pypi.python.org/pypi/tornado
@@ -76,7 +75,6 @@ Recommends:	python3-pygments
 
 %package -n python3-%{srcname}-core
 Summary:	PEP 517 build backend for packages using Flit
-%{?python_provide:%python_provide python3-%{srcname}-core}
 Conflicts:	python3-%{srcname} < 2.1.0-2
 # We manually specify this, because it's bundled upstream and not in the metadata
 Requires:       python3-tomli

From a4eda2e18b473c2075487e4b2fef6c97266a1b70 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 22 Jul 2022 18:33:22 +0000
Subject: [PATCH 09/24] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 python-flit.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-flit.spec b/python-flit.spec
index 9a8e4eb..643c210 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -5,7 +5,7 @@
 
 Name:		python-%{srcname}
 Version:	3.7.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Simplified packaging of Python modules
 
 # ./flit/log.py under ASL 2.0 license
@@ -145,6 +145,9 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 
 
 %changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sun Jun 26 2022 Maxwell G <gotmax@e.email> - 3.7.1-4
 - Removed unnecessarily vendored tomli.
 

From c7d76eaecaaf1750efe6c50eba4a5bde04fd45ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
Date: Thu, 10 Nov 2022 12:46:27 +0100
Subject: [PATCH 10/24] Update to 3.8.0

Fixes: rhbz#2140390
---
 .gitignore       |  1 +
 python-flit.spec | 21 ++++++++-------------
 sources          |  2 +-
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 58df7ba..45fb183 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /flit-3.4.0.tar.gz
 /flit-3.5.1.tar.gz
 /flit-3.7.1.tar.gz
+/flit-3.8.0.tar.gz
diff --git a/python-flit.spec b/python-flit.spec
index 643c210..2f35431 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -4,8 +4,8 @@
 %global srcname flit
 
 Name:		python-%{srcname}
-Version:	3.7.1
-Release:	5%{?dist}
+Version:	3.8.0
+Release:	1%{?dist}
 Summary:	Simplified packaging of Python modules
 
 # ./flit/log.py under ASL 2.0 license
@@ -23,9 +23,6 @@ BuildRequires:	python3-devel
 BuildRequires:	pyproject-rpm-macros >= 0-40
 BuildRequires:	python3-pip
 
-# Runtime deps needed to build self
-BuildRequires:	python3-tomli
-
 %if %{with tests}
 # Runtime deps, others
 BuildRequires:	python3-requests
@@ -76,8 +73,6 @@ Recommends:	python3-pygments
 %package -n python3-%{srcname}-core
 Summary:	PEP 517 build backend for packages using Flit
 Conflicts:	python3-%{srcname} < 2.1.0-2
-# We manually specify this, because it's bundled upstream and not in the metadata
-Requires:       python3-tomli
 
 %description -n python3-%{srcname}-core
 This provides a PEP 517 build backend for packages using Flit.
@@ -88,13 +83,9 @@ at flit_core.buildapi.
 %prep
 %autosetup -p1 -n %{srcname}-%{version}
 
-# Remove vendored tomli that flit_core includes to solve the circular dependency.
+# Remove vendored tomli that flit_core includes to solve the circular dependency on older Pythons
 # (flit_core requires tomli, but flit_core is needed to build tomli).
-# We don't use this, as python3-tomli already has its own bootstrap bcond
-# to build without flit_core.
-#
-# flit's tests already require tomli, so we're pulling it in at buildtime anyways.
-sed -i 's|from \.vendor import tomli|import tomli|' flit_core/flit_core/config.py
+# We don't use this, as tomllib is a part of standard library since Python 3.11.
 rm -rf flit_core/flit_core/vendor
 
 %build
@@ -145,6 +136,10 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 
 
 %changelog
+* Thu Nov 10 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.8.0-1
+- Update to 3.8.0
+- Fixes: rhbz#2140390
+
 * Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 573f527..017d269 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flit-3.7.1.tar.gz) = e38162696a24a0f8d9a61f3364c2ada9c8024309b02138af66c53790e14f88bf285822ea85d6634e85f88d9712eaad039bb5dcbbd1ac1f87bce6b2790bd96d6f
+SHA512 (flit-3.8.0.tar.gz) = c4af79e1511e647303dc6b0913d8526586580db8d916aa7c4a52a9ebb281b375b6082e961ac8be05c0fc8ffdd8c3ec858fcba4e7faea25f465895288fa09c355

From 7f701ecdb256cae2a90d3f6d2138b4873a59fcc8 Mon Sep 17 00:00:00 2001
From: Maxwell G <gotmax@e.email>
Date: Sun, 13 Nov 2022 11:33:59 -0600
Subject: [PATCH 11/24] Add missing test dependency on git

```
tests/test_sdist.py::test_make_sdist SKIPPED (requires git)              [ 74%]
tests/test_sdist.py::test_sdist_no_setup_py SKIPPED (requires git)       [ 74%]
```
---
 python-flit.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/python-flit.spec b/python-flit.spec
index 2f35431..510ed55 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -34,6 +34,7 @@ BuildRequires:	python3-tomli-w
 BuildRequires:	/usr/bin/python
 BuildRequires:	python3-pytest
 BuildRequires:	python3-responses
+BuildRequires:	git-core
 
 # Test deps that require flit to build:
 BuildRequires:	python3-testpath

From d4e76db394afd7a39309ea9f269b46a45e6ea8c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
Date: Mon, 14 Nov 2022 13:12:05 +0100
Subject: [PATCH 12/24] Add bcond for flit bootstrap

---
 python-flit.spec | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/python-flit.spec b/python-flit.spec
index 510ed55..2cb7db6 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -1,5 +1,12 @@
-# circular build dependency on requests-download and testpath
-%bcond_without tests
+# When bootstrapping new Python we need to build flit in bootstrap mode.
+# The Python RPM dependency generators and pip are not yet available.
+# When building in bootstrap mode, only flit-core is built.
+%bcond bootstrap 0
+
+# Tests are enabled by default, unless we bootstrap.
+# Disable them to avoid a circular build dependency on requests-download and testpath.
+%bcond tests %{without bootstrap}
+
 
 %global srcname flit
 
@@ -20,8 +27,10 @@ Source1:	https://pypi.org/pypi?%3Aaction=list_classifiers#/classifiers.lst
 
 BuildArch:	noarch
 BuildRequires:	python3-devel
+%if %{without bootstrap}
 BuildRequires:	pyproject-rpm-macros >= 0-40
 BuildRequires:	python3-pip
+%endif
 
 %if %{with tests}
 # Runtime deps, others
@@ -57,6 +66,7 @@ so long as they can be imported on Python 3.}
 %description %_description
 
 
+%if %{without bootstrap}
 %package -n python3-%{srcname}
 Summary:	%{summary}
 Requires:	python3-%{srcname}-core = %{version}-%{release}
@@ -69,12 +79,20 @@ Provides:	bundled(python3dist(tornado))
 Recommends:	python3-pygments
 
 %description -n python3-%{srcname} %_description
+%endif
 
 
 %package -n python3-%{srcname}-core
 Summary:	PEP 517 build backend for packages using Flit
 Conflicts:	python3-%{srcname} < 2.1.0-2
 
+# RPM generators are not yet available when we bootstrap
+%if %{with bootstrap}
+Provides:       python%{python3_pkgversion}dist(flit-core) = %{version}
+Provides:       python%{python3_version}dist(flit-core) = %{version}
+Requires:       python(abi) = %{python3_version}
+%endif
+
 %description -n python3-%{srcname}-core
 This provides a PEP 517 build backend for packages using Flit.
 The only public interface is the API specified by PEP 517,
@@ -94,15 +112,26 @@ export FLIT_NO_NETWORK=1
 
 # first, build flit_core with self
 cd flit_core
+%if %{with bootstrap}
+%{python3} -m flit_core.wheel
+%else
 %pyproject_wheel
 cd -
 
 # build of the main flit (needs flit_core)
 export PYTHONPATH=$PWD:$PWD/flit_core
 %pyproject_wheel
+%endif
 
 %install
+%if %{with bootstrap}
+cd flit_core
+%{python3} bootstrap_install.py --install-root %{buildroot} dist/flit_core-%{version}-py3-none-any.whl
+# for consistency with %%pyproject_install:
+rm %{buildroot}%{python3_sitelib}/flit_core-*.dist-info/RECORD
+%else
 %pyproject_install
+%endif
 
 # don't ship tests in flit_core package
 # if upstream decides to change the installation, it can be removed:
@@ -121,12 +150,14 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 %endif
 
 
+%if %{without bootstrap}
 %files -n python3-%{srcname}
 %license LICENSE
 %doc README.rst
 %{python3_sitelib}/flit-*.dist-info/
 %{python3_sitelib}/flit/
 %{_bindir}/flit
+%endif
 
 
 %files -n python3-%{srcname}-core

From 17d77b0a2680b095f7204500fdc26450fd1511c2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 20 Jan 2023 13:16:40 +0000
Subject: [PATCH 13/24] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 python-flit.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/python-flit.spec b/python-flit.spec
index 2cb7db6..790223d 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -12,7 +12,7 @@
 
 Name:		python-%{srcname}
 Version:	3.8.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Simplified packaging of Python modules
 
 # ./flit/log.py under ASL 2.0 license
@@ -168,6 +168,9 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 
 
 %changelog
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Thu Nov 10 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 3.8.0-1
 - Update to 3.8.0
 - Fixes: rhbz#2140390

From 3449703bd84bb168ad056678dbd56c8b02758e88 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Mon, 15 May 2023 08:19:41 -0400
Subject: [PATCH 14/24] Disable tests by default in RHEL builds

RHEL does not include all the test dependencies.
---
 python-flit.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/python-flit.spec b/python-flit.spec
index 790223d..4e1b344 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -5,7 +5,8 @@
 
 # Tests are enabled by default, unless we bootstrap.
 # Disable them to avoid a circular build dependency on requests-download and testpath.
-%bcond tests %{without bootstrap}
+# RHEL does not have all the test dependencies
+%bcond tests %[%{without bootstrap} && ! %[%{defined rhel} && %{undefined epel}]]
 
 
 %global srcname flit

From 42ec117fa761569cccb46945c055e3149a2f367b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 19 May 2023 15:01:54 +0200
Subject: [PATCH 15/24] Spec: Expand %srcname for easier readability

---
 python-flit.spec | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/python-flit.spec b/python-flit.spec
index 4e1b344..95394df 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -9,9 +9,7 @@
 %bcond tests %[%{without bootstrap} && ! %[%{defined rhel} && %{undefined epel}]]
 
 
-%global srcname flit
-
-Name:		python-%{srcname}
+Name:		python-flit
 Version:	3.8.0
 Release:	2%{?dist}
 Summary:	Simplified packaging of Python modules
@@ -21,7 +19,7 @@ Summary:	Simplified packaging of Python modules
 License:	BSD and ASL 2.0 and Python
 
 URL:		https://flit.readthedocs.io/en/latest/
-Source0:	https://github.com/takluyver/flit/archive/%{version}/%{srcname}-%{version}.tar.gz
+Source0:	https://github.com/takluyver/flit/archive/%{version}/flit-%{version}.tar.gz
 
 # For the tests
 Source1:	https://pypi.org/pypi?%3Aaction=list_classifiers#/classifiers.lst
@@ -68,9 +66,9 @@ so long as they can be imported on Python 3.}
 
 
 %if %{without bootstrap}
-%package -n python3-%{srcname}
+%package -n python3-flit
 Summary:	%{summary}
-Requires:	python3-%{srcname}-core = %{version}-%{release}
+Requires:	python3-flit-core = %{version}-%{release}
 
 # https://pypi.python.org/pypi/tornado
 # ./flit/log.py unknown version
@@ -79,13 +77,13 @@ Provides:	bundled(python3dist(tornado))
 # soft dependency: (WARNING) Cannot analyze code. Pygments package not found.
 Recommends:	python3-pygments
 
-%description -n python3-%{srcname} %_description
+%description -n python3-flit %_description
 %endif
 
 
-%package -n python3-%{srcname}-core
+%package -n python3-flit-core
 Summary:	PEP 517 build backend for packages using Flit
-Conflicts:	python3-%{srcname} < 2.1.0-2
+Conflicts:	python3-flit < 2.1.0-2
 
 # RPM generators are not yet available when we bootstrap
 %if %{with bootstrap}
@@ -94,14 +92,14 @@ Provides:       python%{python3_version}dist(flit-core) = %{version}
 Requires:       python(abi) = %{python3_version}
 %endif
 
-%description -n python3-%{srcname}-core
+%description -n python3-flit-core
 This provides a PEP 517 build backend for packages using Flit.
 The only public interface is the API specified by PEP 517,
 at flit_core.buildapi.
 
 
 %prep
-%autosetup -p1 -n %{srcname}-%{version}
+%autosetup -p1 -n flit-%{version}
 
 # Remove vendored tomli that flit_core includes to solve the circular dependency on older Pythons
 # (flit_core requires tomli, but flit_core is needed to build tomli).
@@ -152,7 +150,7 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 
 
 %if %{without bootstrap}
-%files -n python3-%{srcname}
+%files -n python3-flit
 %license LICENSE
 %doc README.rst
 %{python3_sitelib}/flit-*.dist-info/
@@ -161,7 +159,7 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 %endif
 
 
-%files -n python3-%{srcname}-core
+%files -n python3-flit-core
 %license LICENSE
 %doc flit_core/README.rst
 %{python3_sitelib}/flit_core-*.dist-info/

From a50c5e291d800af6a148de5e49718de969e12091 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 19 May 2023 15:03:59 +0200
Subject: [PATCH 16/24] Spec: Don't mix tabs and spaces, stick with 16-aligned
 spaces

---
 python-flit.spec | 57 ++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/python-flit.spec b/python-flit.spec
index 95394df..3f0e2ce 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -8,45 +8,44 @@
 # RHEL does not have all the test dependencies
 %bcond tests %[%{without bootstrap} && ! %[%{defined rhel} && %{undefined epel}]]
 
-
-Name:		python-flit
-Version:	3.8.0
-Release:	2%{?dist}
-Summary:	Simplified packaging of Python modules
+Name:           python-flit
+Version:        3.8.0
+Release:        2%{?dist}
+Summary:        Simplified packaging of Python modules
 
 # ./flit/log.py under ASL 2.0 license
 # ./flit/upload.py under PSF license
-License:	BSD and ASL 2.0 and Python
+License:        BSD and ASL 2.0 and Python
 
-URL:		https://flit.readthedocs.io/en/latest/
-Source0:	https://github.com/takluyver/flit/archive/%{version}/flit-%{version}.tar.gz
+URL:            https://flit.readthedocs.io/en/latest/
+Source0:        https://github.com/takluyver/flit/archive/%{version}/flit-%{version}.tar.gz
 
 # For the tests
-Source1:	https://pypi.org/pypi?%3Aaction=list_classifiers#/classifiers.lst
+Source1:        https://pypi.org/pypi?%3Aaction=list_classifiers#/classifiers.lst
 
-BuildArch:	noarch
-BuildRequires:	python3-devel
+BuildArch:      noarch
+BuildRequires:  python3-devel
 %if %{without bootstrap}
-BuildRequires:	pyproject-rpm-macros >= 0-40
-BuildRequires:	python3-pip
+BuildRequires:  pyproject-rpm-macros >= 0-40
+BuildRequires:  python3-pip
 %endif
 
 %if %{with tests}
 # Runtime deps, others
-BuildRequires:	python3-requests
-BuildRequires:	python3-docutils
-BuildRequires:	python3-pygments
-BuildRequires:	python3-tomli-w
+BuildRequires:  python3-requests
+BuildRequires:  python3-docutils
+BuildRequires:  python3-pygments
+BuildRequires:  python3-tomli-w
 
 # Test deps
-BuildRequires:	/usr/bin/python
-BuildRequires:	python3-pytest
-BuildRequires:	python3-responses
-BuildRequires:	git-core
+BuildRequires:  /usr/bin/python
+BuildRequires:  python3-pytest
+BuildRequires:  python3-responses
+BuildRequires:  git-core
 
 # Test deps that require flit to build:
-BuildRequires:	python3-testpath
-BuildRequires:	python3-requests-download
+BuildRequires:  python3-testpath
+BuildRequires:  python3-requests-download
 %endif
 
 %global _description %{expand:
@@ -67,23 +66,23 @@ so long as they can be imported on Python 3.}
 
 %if %{without bootstrap}
 %package -n python3-flit
-Summary:	%{summary}
-Requires:	python3-flit-core = %{version}-%{release}
+Summary:        %{summary}
+Requires:       python3-flit-core = %{version}-%{release}
 
 # https://pypi.python.org/pypi/tornado
 # ./flit/log.py unknown version
-Provides:	bundled(python3dist(tornado))
+Provides:       bundled(python3dist(tornado))
 
 # soft dependency: (WARNING) Cannot analyze code. Pygments package not found.
-Recommends:	python3-pygments
+Recommends:     python3-pygments
 
 %description -n python3-flit %_description
 %endif
 
 
 %package -n python3-flit-core
-Summary:	PEP 517 build backend for packages using Flit
-Conflicts:	python3-flit < 2.1.0-2
+Summary:        PEP 517 build backend for packages using Flit
+Conflicts:      python3-flit < 2.1.0-2
 
 # RPM generators are not yet available when we bootstrap
 %if %{with bootstrap}

From 3d5f4d5c943577a704decb7b99c06de0a9e00d6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 19 May 2023 15:07:23 +0200
Subject: [PATCH 17/24] Update the license tag to SPDX

---
 python-flit.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/python-flit.spec b/python-flit.spec
index 3f0e2ce..eb510db 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -13,9 +13,9 @@ Version:        3.8.0
 Release:        2%{?dist}
 Summary:        Simplified packaging of Python modules
 
-# ./flit/log.py under ASL 2.0 license
-# ./flit/upload.py under PSF license
-License:        BSD and ASL 2.0 and Python
+# ./flit/log.py: Apache-2.0
+# ./flit/upload.py: PSF-2.0
+License:        BSD-3-Clause AND Apache-2.0 AND PSF-2.0
 
 URL:            https://flit.readthedocs.io/en/latest/
 Source0:        https://github.com/takluyver/flit/archive/%{version}/flit-%{version}.tar.gz

From 6fdcc73ef3942c4af718d83d32b61b2275027aef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 19 May 2023 15:08:24 +0200
Subject: [PATCH 18/24] Update URLs

---
 python-flit.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python-flit.spec b/python-flit.spec
index eb510db..b8c2c96 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -17,8 +17,8 @@ Summary:        Simplified packaging of Python modules
 # ./flit/upload.py: PSF-2.0
 License:        BSD-3-Clause AND Apache-2.0 AND PSF-2.0
 
-URL:            https://flit.readthedocs.io/en/latest/
-Source0:        https://github.com/takluyver/flit/archive/%{version}/flit-%{version}.tar.gz
+URL:            https://flit.pypa.io/
+Source0:        https://github.com/pypa/flit/archive/%{version}/flit-%{version}.tar.gz
 
 # For the tests
 Source1:        https://pypi.org/pypi?%3Aaction=list_classifiers#/classifiers.lst

From d20fe2824351e77af24a613947a2024e460dca07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 19 May 2023 15:09:06 +0200
Subject: [PATCH 19/24] Re-fetch the classifiers.lst from PyPI

---
 classifiers.lst | 71 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)

diff --git a/classifiers.lst b/classifiers.lst
index ca7074b..5b79770 100644
--- a/classifiers.lst
+++ b/classifiers.lst
@@ -37,8 +37,19 @@ Environment :: GPU :: NVIDIA CUDA :: 9.2
 Environment :: GPU :: NVIDIA CUDA :: 10.0
 Environment :: GPU :: NVIDIA CUDA :: 10.1
 Environment :: GPU :: NVIDIA CUDA :: 10.2
+Environment :: GPU :: NVIDIA CUDA :: 11
 Environment :: GPU :: NVIDIA CUDA :: 11.0
 Environment :: GPU :: NVIDIA CUDA :: 11.1
+Environment :: GPU :: NVIDIA CUDA :: 11.2
+Environment :: GPU :: NVIDIA CUDA :: 11.3
+Environment :: GPU :: NVIDIA CUDA :: 11.4
+Environment :: GPU :: NVIDIA CUDA :: 11.5
+Environment :: GPU :: NVIDIA CUDA :: 11.6
+Environment :: GPU :: NVIDIA CUDA :: 11.7
+Environment :: GPU :: NVIDIA CUDA :: 11.8
+Environment :: GPU :: NVIDIA CUDA :: 12
+Environment :: GPU :: NVIDIA CUDA :: 12 :: 12.0
+Environment :: GPU :: NVIDIA CUDA :: 12 :: 12.1
 Environment :: Handhelds/PDA's
 Environment :: MacOS X
 Environment :: MacOS X :: Aqua
@@ -52,6 +63,9 @@ Environment :: Web Environment
 Environment :: Web Environment :: Buffet
 Environment :: Web Environment :: Mozilla
 Environment :: Web Environment :: ToscaWidgets
+Environment :: WebAssembly
+Environment :: WebAssembly :: Emscripten
+Environment :: WebAssembly :: WASI
 Environment :: Win32 (MS Windows)
 Environment :: X11 Applications
 Environment :: X11 Applications :: GTK
@@ -60,8 +74,12 @@ Environment :: X11 Applications :: KDE
 Environment :: X11 Applications :: Qt
 Framework :: AWS CDK
 Framework :: AWS CDK :: 1
+Framework :: AWS CDK :: 2
 Framework :: AiiDA
 Framework :: Ansible
+Framework :: AnyIO
+Framework :: Apache Airflow
+Framework :: Apache Airflow :: Provider
 Framework :: AsyncIO
 Framework :: BEAT
 Framework :: BFG
@@ -72,11 +90,14 @@ Framework :: Buildout :: Extension
 Framework :: Buildout :: Recipe
 Framework :: CastleCMS
 Framework :: CastleCMS :: Theme
+Framework :: Celery
 Framework :: Chandler
 Framework :: CherryPy
 Framework :: CubicWeb
 Framework :: Dash
+Framework :: Datasette
 Framework :: Django
+Framework :: Django :: 1
 Framework :: Django :: 1.4
 Framework :: Django :: 1.5
 Framework :: Django :: 1.6
@@ -85,30 +106,61 @@ Framework :: Django :: 1.8
 Framework :: Django :: 1.9
 Framework :: Django :: 1.10
 Framework :: Django :: 1.11
+Framework :: Django :: 2
 Framework :: Django :: 2.0
 Framework :: Django :: 2.1
 Framework :: Django :: 2.2
+Framework :: Django :: 3
 Framework :: Django :: 3.0
 Framework :: Django :: 3.1
 Framework :: Django :: 3.2
+Framework :: Django :: 4
+Framework :: Django :: 4.0
+Framework :: Django :: 4.1
+Framework :: Django :: 4.2
 Framework :: Django CMS
 Framework :: Django CMS :: 3.4
 Framework :: Django CMS :: 3.5
 Framework :: Django CMS :: 3.6
 Framework :: Django CMS :: 3.7
 Framework :: Django CMS :: 3.8
+Framework :: Django CMS :: 3.9
+Framework :: Django CMS :: 3.10
+Framework :: Django CMS :: 3.11
+Framework :: Django CMS :: 4.0
+Framework :: Django CMS :: 4.1
+Framework :: FastAPI
 Framework :: Flake8
 Framework :: Flask
+Framework :: Hatch
 Framework :: Hypothesis
 Framework :: IDLE
 Framework :: IPython
 Framework :: Jupyter
+Framework :: Jupyter :: JupyterLab
+Framework :: Jupyter :: JupyterLab :: 1
+Framework :: Jupyter :: JupyterLab :: 2
+Framework :: Jupyter :: JupyterLab :: 3
+Framework :: Jupyter :: JupyterLab :: 4
+Framework :: Jupyter :: JupyterLab :: Extensions
+Framework :: Jupyter :: JupyterLab :: Extensions :: Mime Renderers
+Framework :: Jupyter :: JupyterLab :: Extensions :: Prebuilt
+Framework :: Jupyter :: JupyterLab :: Extensions :: Themes
 Framework :: Kedro
 Framework :: Lektor
 Framework :: Masonite
 Framework :: Matplotlib
 Framework :: Nengo
 Framework :: Odoo
+Framework :: Odoo :: 8.0
+Framework :: Odoo :: 9.0
+Framework :: Odoo :: 10.0
+Framework :: Odoo :: 11.0
+Framework :: Odoo :: 12.0
+Framework :: Odoo :: 13.0
+Framework :: Odoo :: 14.0
+Framework :: Odoo :: 15.0
+Framework :: Odoo :: 16.0
 Framework :: Opps
 Framework :: Paste
 Framework :: Pelican
@@ -128,7 +180,12 @@ Framework :: Plone :: 5.3
 Framework :: Plone :: 6.0
 Framework :: Plone :: Addon
 Framework :: Plone :: Core
+Framework :: Plone :: Distribution
 Framework :: Plone :: Theme
+Framework :: Pycsou
+Framework :: Pydantic
+Framework :: Pydantic :: 1
+Framework :: Pydantic :: 2
 Framework :: Pylons
 Framework :: Pyramid
 Framework :: Pytest
@@ -151,6 +208,9 @@ Framework :: Twisted
 Framework :: Wagtail
 Framework :: Wagtail :: 1
 Framework :: Wagtail :: 2
+Framework :: Wagtail :: 3
+Framework :: Wagtail :: 4
+Framework :: Wagtail :: 5
 Framework :: ZODB
 Framework :: Zope
 Framework :: Zope2
@@ -159,6 +219,8 @@ Framework :: Zope :: 2
 Framework :: Zope :: 3
 Framework :: Zope :: 4
 Framework :: Zope :: 5
+Framework :: aiohttp
+Framework :: cocotb
 Framework :: napari
 Framework :: tox
 Intended Audience :: Customer Service
@@ -234,6 +296,7 @@ License :: OSI Approved :: Motosoto License
 License :: OSI Approved :: Mozilla Public License 1.0 (MPL)
 License :: OSI Approved :: Mozilla Public License 1.1 (MPL 1.1)
 License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
+License :: OSI Approved :: Mulan Permissive Software License v2 (MulanPSL-2.0)
 License :: OSI Approved :: Nethack General Public License
 License :: OSI Approved :: Nokia Open Source License
 License :: OSI Approved :: Open Group Test Suite License
@@ -330,6 +393,7 @@ Operating System :: Microsoft :: Windows :: Windows 7
 Operating System :: Microsoft :: Windows :: Windows 8
 Operating System :: Microsoft :: Windows :: Windows 8.1
 Operating System :: Microsoft :: Windows :: Windows 10
+Operating System :: Microsoft :: Windows :: Windows 11
 Operating System :: Microsoft :: Windows :: Windows 95/98/2000
 Operating System :: Microsoft :: Windows :: Windows CE
 Operating System :: Microsoft :: Windows :: Windows NT/2000
@@ -370,6 +434,7 @@ Programming Language :: C#
 Programming Language :: C++
 Programming Language :: Cold Fusion
 Programming Language :: Cython
+Programming Language :: D
 Programming Language :: Delphi/Kylix
 Programming Language :: Dylan
 Programming Language :: Eiffel
@@ -422,6 +487,8 @@ Programming Language :: Python :: 3.7
 Programming Language :: Python :: 3.8
 Programming Language :: Python :: 3.9
 Programming Language :: Python :: 3.10
+Programming Language :: Python :: 3.11
+Programming Language :: Python :: 3.12
 Programming Language :: Python :: Implementation
 Programming Language :: Python :: Implementation :: CPython
 Programming Language :: Python :: Implementation :: IronPython
@@ -522,6 +589,9 @@ Topic :: Documentation :: Sphinx
 Topic :: Education
 Topic :: Education :: Computer Aided Instruction (CAI)
 Topic :: Education :: Testing
+Topic :: File Formats
+Topic :: File Formats :: JSON
+Topic :: File Formats :: JSON :: JSON Schema
 Topic :: Games/Entertainment
 Topic :: Games/Entertainment :: Arcade
 Topic :: Games/Entertainment :: Board Games
@@ -754,4 +824,5 @@ Topic :: Text Processing :: Markup :: VRML
 Topic :: Text Processing :: Markup :: XML
 Topic :: Text Processing :: Markup :: reStructuredText
 Topic :: Utilities
+Typing :: Stubs Only
 Typing :: Typed
\ No newline at end of file

From 48c4b38a9d3c43223afbdd2c41e652e2bf6a83ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 19 May 2023 16:22:06 +0200
Subject: [PATCH 20/24] Fork python-flit-core from the python-flit package

---
 python-flit.spec | 100 +++++++++--------------------------------------
 1 file changed, 18 insertions(+), 82 deletions(-)

diff --git a/python-flit.spec b/python-flit.spec
index b8c2c96..4685a12 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -1,16 +1,10 @@
-# When bootstrapping new Python we need to build flit in bootstrap mode.
-# The Python RPM dependency generators and pip are not yet available.
-# When building in bootstrap mode, only flit-core is built.
-%bcond bootstrap 0
-
-# Tests are enabled by default, unless we bootstrap.
-# Disable them to avoid a circular build dependency on requests-download and testpath.
+# Tests are enabled by default
 # RHEL does not have all the test dependencies
-%bcond tests %[%{without bootstrap} && ! %[%{defined rhel} && %{undefined epel}]]
+%bcond tests %[! %[%{defined rhel} && %{undefined epel}]]
 
 Name:           python-flit
 Version:        3.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simplified packaging of Python modules
 
 # ./flit/log.py: Apache-2.0
@@ -25,27 +19,14 @@ Source1:        https://pypi.org/pypi?%3Aaction=list_classifiers#/classifiers.ls
 
 BuildArch:      noarch
 BuildRequires:  python3-devel
-%if %{without bootstrap}
-BuildRequires:  pyproject-rpm-macros >= 0-40
-BuildRequires:  python3-pip
-%endif
 
 %if %{with tests}
-# Runtime deps, others
-BuildRequires:  python3-requests
-BuildRequires:  python3-docutils
-BuildRequires:  python3-pygments
-BuildRequires:  python3-tomli-w
-
-# Test deps
 BuildRequires:  /usr/bin/python
 BuildRequires:  python3-pytest
 BuildRequires:  python3-responses
-BuildRequires:  git-core
-
-# Test deps that require flit to build:
 BuildRequires:  python3-testpath
 BuildRequires:  python3-requests-download
+BuildRequires:  git-core
 %endif
 
 %global _description %{expand:
@@ -64,10 +45,8 @@ so long as they can be imported on Python 3.}
 %description %_description
 
 
-%if %{without bootstrap}
 %package -n python3-flit
 Summary:        %{summary}
-Requires:       python3-flit-core = %{version}-%{release}
 
 # https://pypi.python.org/pypi/tornado
 # ./flit/log.py unknown version
@@ -77,95 +56,52 @@ Provides:       bundled(python3dist(tornado))
 Recommends:     python3-pygments
 
 %description -n python3-flit %_description
-%endif
-
-
-%package -n python3-flit-core
-Summary:        PEP 517 build backend for packages using Flit
-Conflicts:      python3-flit < 2.1.0-2
-
-# RPM generators are not yet available when we bootstrap
-%if %{with bootstrap}
-Provides:       python%{python3_pkgversion}dist(flit-core) = %{version}
-Provides:       python%{python3_version}dist(flit-core) = %{version}
-Requires:       python(abi) = %{python3_version}
-%endif
-
-%description -n python3-flit-core
-This provides a PEP 517 build backend for packages using Flit.
-The only public interface is the API specified by PEP 517,
-at flit_core.buildapi.
 
 
 %prep
 %autosetup -p1 -n flit-%{version}
 
-# Remove vendored tomli that flit_core includes to solve the circular dependency on older Pythons
-# (flit_core requires tomli, but flit_core is needed to build tomli).
-# We don't use this, as tomllib is a part of standard library since Python 3.11.
-rm -rf flit_core/flit_core/vendor
+
+%generate_buildrequires
+%pyproject_buildrequires
+
 
 %build
 export FLIT_NO_NETWORK=1
-
-# first, build flit_core with self
-cd flit_core
-%if %{with bootstrap}
-%{python3} -m flit_core.wheel
-%else
 %pyproject_wheel
-cd -
 
-# build of the main flit (needs flit_core)
-export PYTHONPATH=$PWD:$PWD/flit_core
-%pyproject_wheel
-%endif
 
 %install
-%if %{with bootstrap}
-cd flit_core
-%{python3} bootstrap_install.py --install-root %{buildroot} dist/flit_core-%{version}-py3-none-any.whl
-# for consistency with %%pyproject_install:
-rm %{buildroot}%{python3_sitelib}/flit_core-*.dist-info/RECORD
-%else
 %pyproject_install
-%endif
+%pyproject_save_files flit
 
-# don't ship tests in flit_core package
-# if upstream decides to change the installation, it can be removed:
-# https://github.com/takluyver/flit/issues/403
-rm -r %{buildroot}%{python3_sitelib}/flit_core/tests/
 
-%if %{with tests}
 %check
+%pyproject_check_import
+
+%if %{with tests}
 # flit attempts to download list of classifiers from PyPI, but not if it's cached
 # test_invalid_classifier fails without the list
 mkdir -p fake_cache/flit
 cp %{SOURCE1} fake_cache/flit
 export XDG_CACHE_HOME=$PWD/fake_cache
 
+# This also runs tests of flit_core but deselecting them breaks the flit tests,
+# so we run them anyway:
 %pytest
 %endif
 
 
-%if %{without bootstrap}
-%files -n python3-flit
+%files -n python3-flit -f %{pyproject_files}
 %license LICENSE
 %doc README.rst
-%{python3_sitelib}/flit-*.dist-info/
-%{python3_sitelib}/flit/
 %{_bindir}/flit
-%endif
-
-
-%files -n python3-flit-core
-%license LICENSE
-%doc flit_core/README.rst
-%{python3_sitelib}/flit_core-*.dist-info/
-%{python3_sitelib}/flit_core/
 
 
 %changelog
+* Fri May 19 2023 Miro Hrončok <mhroncok@redhat.com> - 3.8.0-3
+- Fork python-flit-core from the python-flit package
+
 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 

From b54a364de944fa0330ee9f2b52aba0a57d6ab42f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 23 May 2023 00:44:53 +0200
Subject: [PATCH 21/24] Drop no longer needed FLIT_NO_NETWORK=1 from the spec

---
 python-flit.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python-flit.spec b/python-flit.spec
index 4685a12..3386d43 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -67,7 +67,6 @@ Recommends:     python3-pygments
 
 
 %build
-export FLIT_NO_NETWORK=1
 %pyproject_wheel
 
 

From ab416ac8901790518b605108dfd85283fa5d1c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 8 Jun 2023 10:36:19 +0200
Subject: [PATCH 22/24] Update to 3.9.0, fixes rhbz#2203614

---
 .gitignore       | 1 +
 python-flit.spec | 7 +++++--
 sources          | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 45fb183..3d0e712 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /flit-3.5.1.tar.gz
 /flit-3.7.1.tar.gz
 /flit-3.8.0.tar.gz
+/flit-3.9.0.tar.gz
diff --git a/python-flit.spec b/python-flit.spec
index 3386d43..6ad821f 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -3,8 +3,8 @@
 %bcond tests %[! %[%{defined rhel} && %{undefined epel}]]
 
 Name:           python-flit
-Version:        3.8.0
-Release:        3%{?dist}
+Version:        3.9.0
+Release:        1%{?dist}
 Summary:        Simplified packaging of Python modules
 
 # ./flit/log.py: Apache-2.0
@@ -98,6 +98,9 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 
 
 %changelog
+* Thu Jun 08 2023 Miro Hrončok <mhroncok@redhat.com> - 3.9.0-1
+- Update to 3.9.0, fixes rhbz#2203614
+
 * Fri May 19 2023 Miro Hrončok <mhroncok@redhat.com> - 3.8.0-3
 - Fork python-flit-core from the python-flit package
 
diff --git a/sources b/sources
index 017d269..2c3625c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (flit-3.8.0.tar.gz) = c4af79e1511e647303dc6b0913d8526586580db8d916aa7c4a52a9ebb281b375b6082e961ac8be05c0fc8ffdd8c3ec858fcba4e7faea25f465895288fa09c355
+SHA512 (flit-3.9.0.tar.gz) = 1218756afcb79af1df0020548102ba29245a9fa998d332357a2a6a2b7b543dda835918f4811ba343e86e1f7c6b45a6dcafe26f8e905c1e49734141f7d4e9f4fc

From c42583e78b030ed178e7220517c6cf0414a61004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 8 Jun 2023 10:37:04 +0200
Subject: [PATCH 23/24] Drop unhelpful Recommends of python3-pygments

Grepping the source for pygments does not reveal anything that would use it.
---
 python-flit.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/python-flit.spec b/python-flit.spec
index 6ad821f..4249ea1 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -52,9 +52,6 @@ Summary:        %{summary}
 # ./flit/log.py unknown version
 Provides:       bundled(python3dist(tornado))
 
-# soft dependency: (WARNING) Cannot analyze code. Pygments package not found.
-Recommends:     python3-pygments
-
 %description -n python3-flit %_description
 
 
@@ -100,6 +97,7 @@ export XDG_CACHE_HOME=$PWD/fake_cache
 %changelog
 * Thu Jun 08 2023 Miro Hrončok <mhroncok@redhat.com> - 3.9.0-1
 - Update to 3.9.0, fixes rhbz#2203614
+- Drop unhelpful Recommends of python3-pygments
 
 * Fri May 19 2023 Miro Hrončok <mhroncok@redhat.com> - 3.8.0-3
 - Fork python-flit-core from the python-flit package

From 590dc247ab9a8b2fef9eb5304a6722d88215f560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 8 Jun 2023 10:41:10 +0200
Subject: [PATCH 24/24] Remove very old pip and Python mentions from the
 %description

---
 python-flit.spec | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/python-flit.spec b/python-flit.spec
index 4249ea1..2543083 100644
--- a/python-flit.spec
+++ b/python-flit.spec
@@ -31,16 +31,12 @@ BuildRequires:  git-core
 
 %global _description %{expand:
 Flit is a simple way to put Python packages and modules on PyPI.
-
-Flit only creates packages in the new 'wheel' format. People using older
-versions of pip (<1.5) or easy_install will not be able to install them.
+It tries to require less thought about packaging and help you avoid common
+mistakes.
 
 Flit packages a single importable module or package at a time, using the import
 name as the name on PyPI. All sub-packages and data files within a package are
-included automatically.
-
-Flit requires Python 3, but you can use it to distribute modules for Python 2,
-so long as they can be imported on Python 3.}
+included automatically.}
 
 %description %_description