From 100ff29523785bae1ac3320f5a6af92dc1f5b10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= Date: Tue, 10 Oct 2023 14:19:00 +0200 Subject: [PATCH] Convert from Fedora for the Python 3.12 stack in RHEL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Miro Hrončok --- python3.12-flit-core.spec | 254 ++++++-------------------------------- 1 file changed, 38 insertions(+), 216 deletions(-) diff --git a/python3.12-flit-core.spec b/python3.12-flit-core.spec index 22f31ea..ab85d1c 100644 --- a/python3.12-flit-core.spec +++ b/python3.12-flit-core.spec @@ -1,25 +1,31 @@ +%global __python3 /usr/bin/python3.12 +%global python3_pkgversion 3.12 + # When bootstrapping new Python we need to build flit in bootstrap mode. # The Python RPM dependency generators and pip are not yet available. -%bcond bootstrap 0 +%bcond_without bootstrap -# Tests are enabled by default, unless we bootstrap. -# Disable them to avoid a circular build dependency on testpath. -%bcond tests %{without bootstrap} +# RHEL: disable tests due to missing dependencies +%bcond_with tests -Name: python-flit-core +Name: python%{python3_pkgversion}-flit-core Version: 3.9.0 -Release: 4%{?dist} +Release: 1%{?dist} Summary: PEP 517 build backend for packages using Flit -# flit-core is BSD-3-Clause -# flit_core/versionno.py contains a regex that is from packaging, BSD-2-Clause -License: BSD-3-Clause AND BSD-2-Clause +# flit-core is BSD (BSD-3-Clause) +# flit_core/versionno.py contains a regex that is from packaging, BSD (BSD-2-Clause) +License: BSD URL: https://flit.pypa.io/ Source: %{pypi_source flit_core} BuildArch: noarch -BuildRequires: python3-devel +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-rpm-macros +%if %{without bootstrap} +BuildRequires: python%{python3_pkgversion}-pip +%endif %if %{with tests} BuildRequires: python3-pytest @@ -34,20 +40,14 @@ at flit_core.buildapi.} %description %_description - -%package -n python3-flit-core -Summary: %{summary} -Conflicts: python3-flit < 2.1.0-2 - -# RPM generators are not yet available when we bootstrap +# RPM generators are not yet available when we bootstrap in Fedora, +# in RHEL we bootstrap the same way %if %{with bootstrap} Provides: python%{python3_pkgversion}dist(flit-core) = %{version} -Provides: python%{python3_version}dist(flit-core) = %{version} -Requires: python(abi) = %{python3_version} +Provides: python%{python3_pkgversion}dist(flit-core) = %{version} +Requires: python(abi) = %{python3_pkgversion} %endif -%description -n python3-flit-core %_description - %prep %autosetup -p1 -n flit_core-%{version} @@ -57,28 +57,17 @@ Requires: python(abi) = %{python3_version} # We don't use this, as tomllib is a part of standard library since Python 3.11. rm -rf flit_core/vendor - -%if %{without bootstrap} -%generate_buildrequires -%pyproject_buildrequires -%endif - - %build -%if %{with bootstrap} %{python3} -m flit_core.wheel -%else -%pyproject_wheel -%endif %install %if %{with bootstrap} %{python3} bootstrap_install.py --install-root %{buildroot} dist/flit_core-%{version}-py3-none-any.whl +%else +%py3_install_wheel flit_core-%{version}-py3-none-any.whl +%endif # 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: @@ -92,7 +81,7 @@ rm -r %{buildroot}%{python3_sitelib}/flit_core/tests/ %endif -%files -n python3-flit-core +%files -n python%{python3_pkgversion}-flit-core %license LICENSE %doc README.rst %{python3_sitelib}/flit_core-*.dist-info/ @@ -100,185 +89,18 @@ rm -r %{buildroot}%{python3_sitelib}/flit_core/tests/ %changelog -* Fri Jul 21 2023 Fedora Release Engineering - 3.9.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild +* Tue Oct 10 2023 Tomáš Hrnčiar - 3.9.0-1 +- Initial package +- Fedora contributions by: + Charalampos Stratakis + Gwyn Ciesla + Igor Gnatenko + Karolina Surma + Lumir Balhar + Maxwell G + Miro Hrončok + Mukundan Ragavan + Tomas Hrcka + Tomáš Hrnčiar + Yaakov Selkowitz -* Fri Jun 16 2023 Python Maint - 3.9.0-3 -- Rebuilt for Python 3.12 - -* Tue Jun 13 2023 Python Maint - 3.9.0-2 -- Bootstrap for Python 3.12 - -* Fri May 26 2023 Miro Hrončok - 3.9.0-1 -- Update to 3.9.0 - -* Fri May 19 2023 Miro Hrončok - 3.8.0-3 -- Fork python-flit-core from the python-flit package -- Adjust the License tag to include flit_core/versionno.py's regex (BSD-2-Clause) - -* Fri Jan 20 2023 Fedora Release Engineering - 3.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Nov 10 2022 Tomáš Hrnčiar - 3.8.0-1 -- Update to 3.8.0 -- Fixes: rhbz#2140390 - -* Fri Jul 22 2022 Fedora Release Engineering - 3.7.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sun Jun 26 2022 Maxwell G - 3.7.1-4 -- Removed unnecessarily vendored tomli. - -* Tue Jun 14 2022 Python Maint - 3.7.1-3 -- Rebuilt for Python 3.11 - -* Mon Jun 13 2022 Python Maint - 3.7.1-2 -- Bootstrap for Python 3.11 - -* Wed Mar 16 2022 Charalampos Stratakis - 3.7.1-1 -- Update to 3.7.1 -- Fixes: rhbz#2057214 - -* Fri Jan 21 2022 Fedora Release Engineering - 3.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Nov 29 2021 Tomáš Hrnčiar - 3.5.1-1 -- Update to 3.5.1 - -* Tue Oct 26 2021 Tomáš Hrnčiar - 3.4.0-1 -- Update to 3.4.0 - -* Wed Aug 04 2021 Tomas Hrnciar - 3.3.0-1 -- Update to 3.3.0 -- Fixes: rhbz#1988744 - -* Tue Jul 27 2021 Fedora Release Engineering - 3.2.0-5 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 3.2.0-4 -- Rebuilt for Python 3.10 - -* Fri Jun 04 2021 Python Maint - 3.2.0-3 -- Bootstrap for Python 3.10 - -* Sat May 29 2021 Miro Hrončok - 3.2.0-2 -- Adapt to pyproject-rpm-macros 0-40+ - -* Tue Mar 30 2021 Karolina Surma - 3.2.0-1 -- Update to 3.2.0 -Resolves: rhbz#1940399 -- Remove tests from the flip_core package - -* Wed Jan 27 2021 Fedora Release Engineering - 3.0.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Nov 19 2020 Miro Hrončok - 3.0.0-2 -- Replace deprecated pytoml with toml - -* Mon Sep 21 2020 Tomas Hrnciar - 3.0.0-1 -- Update to 3.0.0 - -* Wed Jul 29 2020 Fedora Release Engineering - 2.3.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sun May 24 2020 Miro Hrončok - 2.3.0-3 -- Rebuilt for Python 3.9 - -* Sun May 24 2020 Miro Hrončok - 2.3.0-2 -- Bootstrap for Python 3.9 - -* Mon May 11 2020 Tomas Hrnciar - 2.3.0-1 -- Update to 2.3.0 - -* Thu Jan 30 2020 Fedora Release Engineering - 2.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Jan 20 2020 Mukundan Ragavan - 2.2.0-1 -- Update to 2.2.0 - -* Sat Dec 14 2019 Miro Hrončok - 2.1.0-2 -- Properly package flit-core and restore /usr/bin/flit (#1783610) - -* Tue Dec 03 2019 Mukundan Ragavan - 2.1.0-1 -- Update to 2.1.0 - -* Thu Oct 03 2019 Miro Hrončok - 1.3-4 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Sat Aug 17 2019 Miro Hrončok - 1.3-3 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 10 2019 Mukundan Ragavan - 1.3-1 -- Update to 1.3 - -* Sat Feb 02 2019 Fedora Release Engineering - 1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Sep 03 2018 Igor Gnatenko - 1.1-1 -- Update to 1.1 - -* Sat Aug 18 2018 Mukundan Ragavan - 1.0-4 -- Drop pypandoc as requires - -* Sat Jul 14 2018 Fedora Release Engineering - 1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 1.0-2 -- Rebuilt for Python 3.7 - -* Sun Apr 08 2018 Mukundan Ragavan - 1.0-1 -- Update to 1.0 - -* Fri Feb 09 2018 Fedora Release Engineering - 0.13-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Tue Jan 09 2018 Miro Hrončok - 0.13-2 -- Recommend Pygments - -* Sat Dec 23 2017 Mukundan Ragavan - 0.13-1 -- Update to 0.13 - -* Thu Nov 16 2017 Mukundan Ragavan - 0.12.2-1 -- Update to 0.12.2 - -* Wed Nov 08 2017 Mukundan Ragavan - 0.12.1-1 -- Update to 0.12.1 - -* Mon Nov 06 2017 Mukundan Ragavan - 0.12-2 -- Add pytoml as dependency - -* Sun Nov 05 2017 Mukundan Ragavan - 0.12-1 -- Update to 0.12 -- Add pytoml as buildrequires - -* Mon Aug 14 2017 Mukundan Ragavan - 0.11.4-1 -- Update to 0.11.4 -- Drop file-encoding patch (fixed upstream) - -* Thu Jul 27 2017 Fedora Release Engineering - 0.11.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Jun 13 2017 Mukundan Ragavan - 0.11.1-1 -- Update to 0.11.1 - -* Sat Feb 11 2017 Fedora Release Engineering - 0.9-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Jan 23 2017 Michal Cyprian - 0.9-5 -- Use python install wheel macro - -* Mon Dec 19 2016 Miro Hrončok - 0.9-4 -- Rebuild for Python 3.6 - -* Thu Sep 29 2016 Mukundan Ragavan - 0.9-3 -- Updated spec file with license comments and provides - -* Sat Sep 24 2016 Mukundan Ragavan - 0.9-2 -- spec file cleanup - -* Sat Jul 2 2016 Elliott Sales de Andrade 0.9-1 -- Initial RPM release