From ad895630435e255ca7d86428d4ae71727cd90726 Mon Sep 17 00:00:00 2001 From: releng bot Date: Tue, 14 Nov 2023 17:07:01 +0000 Subject: [PATCH 01/19] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..a5e150c --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# python-rpmautospec-core + +The python-rpmautospec-core package From be7dd749a0a479f06b2e029320725dfd555400f1 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 13 Nov 2023 13:25:26 +0100 Subject: [PATCH 02/19] Initial import Signed-off-by: Nils Philippsen --- .gitignore | 1 + python-rpmautospec-core.spec | 49 ++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 51 insertions(+) create mode 100644 .gitignore create mode 100644 python-rpmautospec-core.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..18a7387 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/rpmautospec_core-0.1.0.tar.gz diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec new file mode 100644 index 0000000..a3dea33 --- /dev/null +++ b/python-rpmautospec-core.spec @@ -0,0 +1,49 @@ +%global srcname rpmautospec_core +%global canonicalname %{py_dist_name %{srcname}} + +Name: python-%{canonicalname} +Version: 0.1.0 +Release: %autorelease +Summary: Minimum functionality for rpmautospec + +License: MIT +URL: https://github.com/fedora-infra/%{canonicalname} +Source0: %{pypi_source %{srcname}} +BuildArch: noarch +BuildRequires: python3-devel >= 3.6.0 +BuildRequires: sed + +%generate_buildrequires +%pyproject_buildrequires -t + +%global _description %{expand: +This package contains minimum functionality to determine if an RPM spec file +uses rpmautospec features.} + +%description %_description + +%package -n python3-%{canonicalname} +Summary: %{summary} + +%description -n python3-%{canonicalname} %_description + +%prep +%autosetup -n %{srcname}-%{version} + +%build +%pyproject_wheel + +%install +%pyproject_install +%pyproject_save_files %{srcname} +# Work around poetry not listing license files as such in package metadata. +sed -i -e 's|^\(.*/LICENSE\)|%%license \1|g' %{pyproject_files} + +%check +%tox + +%files -n python3-%{canonicalname} -f %{pyproject_files} +%doc README.md + +%changelog +%autochangelog diff --git a/sources b/sources new file mode 100644 index 0000000..e70047e --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (rpmautospec_core-0.1.0.tar.gz) = 47d71cf81d10ca08498abefd6362aa3e0be48aebfb1ad8978546b27ad1a103564463283a236f9df374e073773c61dd0b8a6ed2e60b6349e0a9fd57edf36b82cb From a53efb98c2c75f8a5f99b02b7541b3c8ceeaac56 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Wed, 15 Nov 2023 12:36:32 +0100 Subject: [PATCH 03/19] Update to 0.1.1 Signed-off-by: Nils Philippsen --- .gitignore | 1 + python-rpmautospec-core.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 18a7387..a816d12 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /rpmautospec_core-0.1.0.tar.gz +/rpmautospec_core-0.1.1.tar.gz diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec index a3dea33..8551fd8 100644 --- a/python-rpmautospec-core.spec +++ b/python-rpmautospec-core.spec @@ -2,7 +2,7 @@ %global canonicalname %{py_dist_name %{srcname}} Name: python-%{canonicalname} -Version: 0.1.0 +Version: 0.1.1 Release: %autorelease Summary: Minimum functionality for rpmautospec @@ -11,10 +11,13 @@ URL: https://github.com/fedora-infra/%{canonicalname} Source0: %{pypi_source %{srcname}} BuildArch: noarch BuildRequires: python3-devel >= 3.6.0 +# The dependencies needed for testing don’t get auto-generated. +BuildRequires: python3dist(pytest) +BuildRequires: python3dist(pytest-cov) BuildRequires: sed %generate_buildrequires -%pyproject_buildrequires -t +%pyproject_buildrequires %global _description %{expand: This package contains minimum functionality to determine if an RPM spec file @@ -40,7 +43,7 @@ Summary: %{summary} sed -i -e 's|^\(.*/LICENSE\)|%%license \1|g' %{pyproject_files} %check -%tox +%pytest %files -n python3-%{canonicalname} -f %{pyproject_files} %doc README.md diff --git a/sources b/sources index e70047e..f493279 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec_core-0.1.0.tar.gz) = 47d71cf81d10ca08498abefd6362aa3e0be48aebfb1ad8978546b27ad1a103564463283a236f9df374e073773c61dd0b8a6ed2e60b6349e0a9fd57edf36b82cb +SHA512 (rpmautospec_core-0.1.1.tar.gz) = 0b59d6d5bb7f240b51d31286a7d50ea022fccc86dbceef3434d52a1d21d76f1c8325e331da23fd660183e693cb8c3b6e474b2b8059f7eb2c2276421eca808ef4 From 9b1359cb07fde965d620f8f3b94af39930eab890 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 17 Nov 2023 17:12:58 +0100 Subject: [PATCH 04/19] Make it build on older EL releases Signed-off-by: Nils Philippsen --- python-rpmautospec-core.spec | 48 ++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec index 8551fd8..354eeeb 100644 --- a/python-rpmautospec-core.spec +++ b/python-rpmautospec-core.spec @@ -1,3 +1,15 @@ +%if ! 0%{?rhel} || 0%{?rhel} >= 10 +%bcond_without testcoverage +%bcond_with compatbuild +%else +%bcond_with testcoverage +%bcond_without compatbuild +%endif + +%if 0%{undefined pyproject_files} +%global pyproject_files %{_builddir}/%{name}-%{version}-%{release}.%{_arch}-pyproject-files +%endif + %global srcname rpmautospec_core %global canonicalname %{py_dist_name %{srcname}} @@ -13,11 +25,17 @@ BuildArch: noarch BuildRequires: python3-devel >= 3.6.0 # The dependencies needed for testing don’t get auto-generated. BuildRequires: python3dist(pytest) +%if %{with testcoverage} BuildRequires: python3dist(pytest-cov) +%endif BuildRequires: sed +%if %{without compatbuild} %generate_buildrequires %pyproject_buildrequires +%else +BuildRequires: python3dist(setuptools) +%endif %global _description %{expand: This package contains minimum functionality to determine if an RPM spec file @@ -27,26 +45,56 @@ uses rpmautospec features.} %package -n python3-%{canonicalname} Summary: %{summary} +%if %{with compatbuild} +%py_provides python3-%{canonicalname} +%endif %description -n python3-%{canonicalname} %_description %prep %autosetup -n %{srcname}-%{version} +%if %{without testcoverage} +cat << PYTESTINI > pytest.ini +[pytest] +addopts = +PYTESTINI +%endif + +%if %{with compatbuild} +cat << SETUPPY > setup.py +from setuptools import setup + +setup(name="%{canonicalname}", version="%{version}") +SETUPPY +%endif + %build +%if %{without compatbuild} %pyproject_wheel +%else +%py3_build +%endif %install +%if %{without compatbuild} %pyproject_install %pyproject_save_files %{srcname} # Work around poetry not listing license files as such in package metadata. sed -i -e 's|^\(.*/LICENSE\)|%%license \1|g' %{pyproject_files} +%else +%py3_install +echo '%{python3_sitelib}/%{srcname}*' > %{pyproject_files} +%endif %check %pytest %files -n python3-%{canonicalname} -f %{pyproject_files} %doc README.md +%if %{with compatbuild} +%license LICENSE +%endif %changelog %autochangelog From fd822b6beff457553ad9d47c37e5e5e29e82a9e7 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 17 Nov 2023 17:19:51 +0100 Subject: [PATCH 05/19] Apply options to different OS versions, oops [skip changelog] Signed-off-by: Nils Philippsen --- python-rpmautospec-core.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec index 354eeeb..c40d100 100644 --- a/python-rpmautospec-core.spec +++ b/python-rpmautospec-core.spec @@ -1,8 +1,13 @@ +%if %if ! 0%{?rhel} || 0%{?rhel} >= 10 %bcond_without testcoverage -%bcond_with compatbuild %else %bcond_with testcoverage +%endif + +%if ! 0%{?rhel} || 0%{?rhel} >= 9 +%bcond_with compatbuild +%else %bcond_without compatbuild %endif From 966470a96b101f2cbfd2a9be1a0609687ed0c120 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 17 Nov 2023 17:21:28 +0100 Subject: [PATCH 06/19] Fix syntax error Sssh, vim. [skip changelog] Signed-off-by: Nils Philippsen --- python-rpmautospec-core.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec index c40d100..c7042bd 100644 --- a/python-rpmautospec-core.spec +++ b/python-rpmautospec-core.spec @@ -1,4 +1,3 @@ -%if %if ! 0%{?rhel} || 0%{?rhel} >= 10 %bcond_without testcoverage %else From b127a043a65e94c0b57361d60a309b5ecc1196a3 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 17 Nov 2023 17:35:44 +0100 Subject: [PATCH 07/19] Build using setuptools on EL <= 9 Signed-off-by: Nils Philippsen --- python-rpmautospec-core.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec index c7042bd..57c55ba 100644 --- a/python-rpmautospec-core.spec +++ b/python-rpmautospec-core.spec @@ -1,7 +1,9 @@ %if ! 0%{?rhel} || 0%{?rhel} >= 10 %bcond_without testcoverage +%bcond_with setup_py %else %bcond_with testcoverage +%bcond_without setup_py %endif %if ! 0%{?rhel} || 0%{?rhel} >= 9 @@ -36,7 +38,12 @@ BuildRequires: sed %if %{without compatbuild} %generate_buildrequires -%pyproject_buildrequires +%if %{without setup.py} +%{pyproject_buildrequires} +%else +( %{pyproject_buildrequires} ) | grep -v poetry +echo 'python3dist(setuptools)' +%endif %else BuildRequires: python3dist(setuptools) %endif @@ -65,7 +72,7 @@ addopts = PYTESTINI %endif -%if %{with compatbuild} +%if %{with setup_py} cat << SETUPPY > setup.py from setuptools import setup From 88084de2b80817953ddcdc5e611f76d704ed161c Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 17 Nov 2023 17:58:32 +0100 Subject: [PATCH 08/19] =?UTF-8?q?Don=E2=80=99t=20generate=20build=20requir?= =?UTF-8?q?es=20on=20EL=20<=3D=209?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nils Philippsen --- python-rpmautospec-core.spec | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec index 57c55ba..197c7e2 100644 --- a/python-rpmautospec-core.spec +++ b/python-rpmautospec-core.spec @@ -1,15 +1,11 @@ %if ! 0%{?rhel} || 0%{?rhel} >= 10 %bcond_without testcoverage -%bcond_with setup_py +%bcond_without pyproject_build +%bcond_without genbrs %else %bcond_with testcoverage -%bcond_without setup_py -%endif - -%if ! 0%{?rhel} || 0%{?rhel} >= 9 -%bcond_with compatbuild -%else -%bcond_without compatbuild +%bcond_with pyproject_build +%bcond_with genbrs %endif %if 0%{undefined pyproject_files} @@ -36,15 +32,11 @@ BuildRequires: python3dist(pytest-cov) %endif BuildRequires: sed -%if %{without compatbuild} +%if %{with genbrs} %generate_buildrequires -%if %{without setup.py} %{pyproject_buildrequires} %else -( %{pyproject_buildrequires} ) | grep -v poetry -echo 'python3dist(setuptools)' -%endif -%else +BuildRequires: python3dist(pip) BuildRequires: python3dist(setuptools) %endif @@ -56,7 +48,7 @@ uses rpmautospec features.} %package -n python3-%{canonicalname} Summary: %{summary} -%if %{with compatbuild} +%if %{without pyproject_build} %py_provides python3-%{canonicalname} %endif @@ -72,7 +64,7 @@ addopts = PYTESTINI %endif -%if %{with setup_py} +%if %{without pyproject_build} cat << SETUPPY > setup.py from setuptools import setup @@ -81,14 +73,14 @@ SETUPPY %endif %build -%if %{without compatbuild} +%if %{with pyproject_build} %pyproject_wheel %else %py3_build %endif %install -%if %{without compatbuild} +%if %{with pyproject_build} %pyproject_install %pyproject_save_files %{srcname} # Work around poetry not listing license files as such in package metadata. @@ -103,7 +95,7 @@ echo '%{python3_sitelib}/%{srcname}*' > %{pyproject_files} %files -n python3-%{canonicalname} -f %{pyproject_files} %doc README.md -%if %{with compatbuild} +%if %{without pyproject_build} %license LICENSE %endif From 425543e3cae8b2562d8bd7acf37a5b8c84e583e5 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 21 Nov 2023 14:10:54 +0100 Subject: [PATCH 09/19] Package the Python package on EL8 Old setuptools versions require to be told explicitly that the package is supposed to be packaged. [skip changelog] Signed-off-by: Nils Philippsen --- python-rpmautospec-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec index 197c7e2..18031d4 100644 --- a/python-rpmautospec-core.spec +++ b/python-rpmautospec-core.spec @@ -68,7 +68,7 @@ PYTESTINI cat << SETUPPY > setup.py from setuptools import setup -setup(name="%{canonicalname}", version="%{version}") +setup(name="%{canonicalname}", version="%{version}", packages=["%{srcname}"]) SETUPPY %endif From 003f563037f89f0d54bcf24852af83519f759313 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sat, 2 Dec 2023 23:07:05 -0500 Subject: [PATCH 10/19] Always disable test coverage checks Coverage checkers should not be run when building Fedora or RHEL packages: https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/#_linters --- python-rpmautospec-core.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec index 18031d4..168369f 100644 --- a/python-rpmautospec-core.spec +++ b/python-rpmautospec-core.spec @@ -1,9 +1,8 @@ +%bcond_with testcoverage %if ! 0%{?rhel} || 0%{?rhel} >= 10 -%bcond_without testcoverage %bcond_without pyproject_build %bcond_without genbrs %else -%bcond_with testcoverage %bcond_with pyproject_build %bcond_with genbrs %endif From fc3684e1c0e201023f31a0f3ac28bedfde1cbed6 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 15 Dec 2023 22:36:48 +0100 Subject: [PATCH 11/19] Update to 0.1.2 Signed-off-by: Nils Philippsen --- .gitignore | 1 + python-rpmautospec-core.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a816d12..76b53fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /rpmautospec_core-0.1.0.tar.gz /rpmautospec_core-0.1.1.tar.gz +/rpmautospec_core-0.1.2.tar.gz diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec index 168369f..2d96985 100644 --- a/python-rpmautospec-core.spec +++ b/python-rpmautospec-core.spec @@ -15,7 +15,7 @@ %global canonicalname %{py_dist_name %{srcname}} Name: python-%{canonicalname} -Version: 0.1.1 +Version: 0.1.2 Release: %autorelease Summary: Minimum functionality for rpmautospec diff --git a/sources b/sources index f493279..4810565 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec_core-0.1.1.tar.gz) = 0b59d6d5bb7f240b51d31286a7d50ea022fccc86dbceef3434d52a1d21d76f1c8325e331da23fd660183e693cb8c3b6e474b2b8059f7eb2c2276421eca808ef4 +SHA512 (rpmautospec_core-0.1.2.tar.gz) = adbc1c9b7749a6a3ae9fa615416c1083ef7c298fc3396c54231d170f7d113aacc3c1fb6cf3e4cb52ce42f2384cb4d95294bdff318facc9d9c62886a88fecb007 From 6d57e5a6c77b8af33d850cc3b89b460df571992f Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Fri, 5 Jan 2024 12:45:28 +0100 Subject: [PATCH 12/19] Update to 0.1.3 Signed-off-by: Nils Philippsen --- .gitignore | 1 + python-rpmautospec-core.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 76b53fd..e316ba9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /rpmautospec_core-0.1.0.tar.gz /rpmautospec_core-0.1.1.tar.gz /rpmautospec_core-0.1.2.tar.gz +/rpmautospec_core-0.1.3.tar.gz diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec index 2d96985..878b9a8 100644 --- a/python-rpmautospec-core.spec +++ b/python-rpmautospec-core.spec @@ -15,7 +15,7 @@ %global canonicalname %{py_dist_name %{srcname}} Name: python-%{canonicalname} -Version: 0.1.2 +Version: 0.1.3 Release: %autorelease Summary: Minimum functionality for rpmautospec diff --git a/sources b/sources index 4810565..b262cf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec_core-0.1.2.tar.gz) = adbc1c9b7749a6a3ae9fa615416c1083ef7c298fc3396c54231d170f7d113aacc3c1fb6cf3e4cb52ce42f2384cb4d95294bdff318facc9d9c62886a88fecb007 +SHA512 (rpmautospec_core-0.1.3.tar.gz) = 2399580ecf6e4369d3c625106fd28f79cff7160c1799aa0168e8fe37a5b9b57231661cb3d6f569ceddb5b462f529038fc93282822108dcea94223e0d63ee347f From 49cc485b5dc30b0cc3f5e36bd959a989ecd193c8 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 9 Jan 2024 12:49:08 +0100 Subject: [PATCH 13/19] Update to 0.1.4 Signed-off-by: Nils Philippsen --- .gitignore | 1 + python-rpmautospec-core.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e316ba9..a1b7718 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /rpmautospec_core-0.1.1.tar.gz /rpmautospec_core-0.1.2.tar.gz /rpmautospec_core-0.1.3.tar.gz +/rpmautospec_core-0.1.4.tar.gz diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec index 878b9a8..746c9fb 100644 --- a/python-rpmautospec-core.spec +++ b/python-rpmautospec-core.spec @@ -15,7 +15,7 @@ %global canonicalname %{py_dist_name %{srcname}} Name: python-%{canonicalname} -Version: 0.1.3 +Version: 0.1.4 Release: %autorelease Summary: Minimum functionality for rpmautospec diff --git a/sources b/sources index b262cf5..47e507b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec_core-0.1.3.tar.gz) = 2399580ecf6e4369d3c625106fd28f79cff7160c1799aa0168e8fe37a5b9b57231661cb3d6f569ceddb5b462f529038fc93282822108dcea94223e0d63ee347f +SHA512 (rpmautospec_core-0.1.4.tar.gz) = ae72a27516c27d96f5e42da555a2d842aa1d8f3e9747598a558ab30847c1986369eacb4312ff8f884c5b8ae3c320d7a56d551e76627fa86d923929471d490c7f From 470ff84a19d862442e6827ffa3b98fe8877ac922 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 06:42:32 +0000 Subject: [PATCH 14/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e9c2387327cfeab3c45bea8baa5acfd8723d6d5f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jan 2024 10:19:32 +0000 Subject: [PATCH 15/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2f230174a4fcfc7b7900365d2cd3915ad70145c0 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Mon, 12 Feb 2024 13:09:06 +0100 Subject: [PATCH 16/19] Cope with undefined %py_dist_name Signed-off-by: Nils Philippsen --- python-rpmautospec-core.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec index 746c9fb..44debc6 100644 --- a/python-rpmautospec-core.spec +++ b/python-rpmautospec-core.spec @@ -12,7 +12,7 @@ %endif %global srcname rpmautospec_core -%global canonicalname %{py_dist_name %{srcname}} +%global canonicalname rpmautospec-core Name: python-%{canonicalname} Version: 0.1.4 From e509340c1ccaee07f0297d8632fd4f1d65f84489 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 23:59:20 +0200 Subject: [PATCH 17/19] Rebuilt for Python 3.13 From f1b610e544388209f8259d2225b74768f9a1003a Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Mon, 24 Jun 2024 09:19:39 -0700 Subject: [PATCH 18/19] Bump release for June 2024 mass rebuild From 5f35979db521dfc17bd995f1a4917bc3ee14eae0 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 27 Jun 2024 15:12:43 +0200 Subject: [PATCH 19/19] Update to 0.1.5 And use setuptools instead of Poetry for building on RHEL and CentOS Stream. Signed-off-by: Nils Philippsen --- .gitignore | 1 + python-rpmautospec-core.spec | 19 +++++++------------ sources | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index a1b7718..04afb77 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /rpmautospec_core-0.1.2.tar.gz /rpmautospec_core-0.1.3.tar.gz /rpmautospec_core-0.1.4.tar.gz +/rpmautospec_core-0.1.5.tar.gz diff --git a/python-rpmautospec-core.spec b/python-rpmautospec-core.spec index 44debc6..392eb3f 100644 --- a/python-rpmautospec-core.spec +++ b/python-rpmautospec-core.spec @@ -1,10 +1,13 @@ %bcond_with testcoverage -%if ! 0%{?rhel} || 0%{?rhel} >= 10 -%bcond_without pyproject_build + +# Only generate buildrequires or use PEP 518 style building on Fedora and new EPEL releases because +# Poetry is missing elsewhere. Fall back to using setuptools instead. +%if ! 0%{?rhel} || 0%{?epel} >= 10 %bcond_without genbrs +%bcond_without pyproject_build %else -%bcond_with pyproject_build %bcond_with genbrs +%bcond_with pyproject_build %endif %if 0%{undefined pyproject_files} @@ -15,7 +18,7 @@ %global canonicalname rpmautospec-core Name: python-%{canonicalname} -Version: 0.1.4 +Version: 0.1.5 Release: %autorelease Summary: Minimum functionality for rpmautospec @@ -63,14 +66,6 @@ addopts = PYTESTINI %endif -%if %{without pyproject_build} -cat << SETUPPY > setup.py -from setuptools import setup - -setup(name="%{canonicalname}", version="%{version}", packages=["%{srcname}"]) -SETUPPY -%endif - %build %if %{with pyproject_build} %pyproject_wheel diff --git a/sources b/sources index 47e507b..4354f50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rpmautospec_core-0.1.4.tar.gz) = ae72a27516c27d96f5e42da555a2d842aa1d8f3e9747598a558ab30847c1986369eacb4312ff8f884c5b8ae3c320d7a56d551e76627fa86d923929471d490c7f +SHA512 (rpmautospec_core-0.1.5.tar.gz) = ab04ad5f97cc2fafc0ae3064aa2aee1b894c987b8402ecc3709e66bafb1f6c0096844be845036fbceefc3b88b5b1ced277f936a1d5e5f35b252415115bd307bb