From 5f35979db521dfc17bd995f1a4917bc3ee14eae0 Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 27 Jun 2024 15:12:43 +0200 Subject: [PATCH] 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