Update to 0.3.6

Additionally, tidy up and modernize the spec file.

Signed-off-by: Nils Philippsen <nils@redhat.com>
This commit is contained in:
Nils Philippsen 2023-11-13 20:07:57 +01:00
parent 5f50ea22b6
commit 2e6cdfb320
2 changed files with 64 additions and 74 deletions

View File

@ -1,126 +1,103 @@
# when bootstrapping Python, pytest-xdist is not yet available
%bcond xdist %{undefined rhel}
%global srcname rpmautospec
Name: python-rpmautospec
Version: 0.3.5
Release: %autorelease
Summary: Package and CLI tool to generate release fields and changelogs
License: MIT
URL: https://pagure.io/fedora-infra/rpmautospec
Source0: https://releases.pagure.org/fedora-infra/rpmautospec/rpmautospec-%{version}.tar.gz
BuildArch: noarch
BuildRequires: git
# the langpacks are needed for tests
BuildRequires: glibc-langpack-de
BuildRequires: glibc-langpack-en
BuildRequires: python3-devel >= 3.6.0
BuildRequires: python3-setuptools
BuildRequires: koji
BuildRequires: python%{python3_pkgversion}-babel
BuildRequires: python3-koji
BuildRequires: python3-pygit2
BuildRequires: python%{python3_pkgversion}-pytest
%if %{with xdist}
BuildRequires: python%{python3_pkgversion}-pytest-xdist
# Package the placeholder rpm-macros (moved to redhat-rpm-config in F40)
%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10)
%bcond rpmmacropkg 1
%else
%bcond rpmmacropkg 0
%endif
BuildRequires: python%{python3_pkgversion}-pyyaml
Obsoletes: koji-hub-plugin-rpmautospec < 0.1.5-2
Conflicts: koji-hub-plugin-rpmautospec < 0.1.5-2
%global srcname rpmautospec
%global canonicalname %{py_dist_name %{srcname}}
Name: python-%{canonicalname}
Version: 0.3.6
Release: %autorelease
Summary: Package and CLI tool to generate release fields and changelogs
License: MIT
URL: https://github.com/fedora-infra/%{canonicalname}
Source0: https://github.com/fedora-infra/%{canonicalname}/releases/download/%{version}/%{canonicalname}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: git
# the langpacks are needed for tests
BuildRequires: glibc-langpack-de
BuildRequires: glibc-langpack-en
BuildRequires: koji
BuildRequires: python3-devel >= 3.9.0
# The dependencies needed for testing dont get auto-generated.
BuildRequires: python3dist(pytest)
BuildRequires: python3dist(pytest-cov)
%if %{with xdist}
BuildRequires: python3dist(pytest-xdist)
%endif
BuildRequires: python3dist(pyyaml)
BuildRequires: sed
%global _description %{expand:
A package and CLI tool to generate RPM release fields and changelogs.}
%description %_description
# package the library
%package -n python3-%{srcname}
Summary: %{summary}
%package -n python3-%{canonicalname}
Summary: %{summary}
%{?python_provide:%python_provide python3-%{srcname}}
Requires: koji
Requires: python3-babel
Requires: python3-koji
Requires: python3-pygit2
Requires: rpm
# for "rpm --specfile"
Requires: rpm-build >= 4.9
%description -n python3-%{srcname} %_description
%description -n python3-%{canonicalname} %_description
# Note that there is no %%files section for the unversioned python module
%files -n python3-%{srcname}
%license LICENSE
%doc README.rst
%{python3_sitelib}/%{srcname}-*.egg-info
%{python3_sitelib}/%{srcname}/
# package the cli tool
%package -n %{srcname}
%package -n %{canonicalname}
Summary: CLI tool for generating RPM releases and changelogs
Requires: python3-%{srcname} = %{version}-%{release}
Requires: python3-%{canonicalname} = %{version}-%{release}
%description -n %{srcname}
%description -n %{canonicalname}
CLI tool for generating RPM releases and changelogs
%files -n %{srcname}
%{_bindir}/rpmautospec
# package the Koji plugins
%package -n koji-builder-plugin-rpmautospec
Summary: Koji plugin for generating RPM releases and changelogs
Requires: python3-%{srcname} = %{version}-%{release}
Requires: python3-koji
Requires: python3-%{canonicalname} = %{version}-%{release}
Requires: koji-builder-plugins
%description -n koji-builder-plugin-rpmautospec
A Koji plugin for generating RPM releases and changelogs.
%files -n koji-builder-plugin-rpmautospec
%{_prefix}/lib/koji-builder-plugins/*
%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10)
# Package the placeholder rpm-macros (moved to redhat-rpm-config in F40)
%if %{with rpmmacropkg}
%package -n rpmautospec-rpm-macros
Summary: Rpmautospec RPM macros for local rpmbuild
Requires: rpm
%description -n rpmautospec-rpm-macros
RPM macros with placeholders for building rpmautospec enabled packages localy
%files -n rpmautospec-rpm-macros
%{rpmmacrodir}/macros.rpmautospec
This package contains RPM macros with placeholders for building rpmautospec
enabled packages locally.
%endif
#--------------------------------------------------------
%generate_buildrequires
%pyproject_buildrequires
%prep
%autosetup -n %{srcname}-%{version}
# The python3-koji package doesn't declare itself properly, so we may not depend on it when
# installed as an RPM.
sed -i /koji/d requirements.txt
%build
%py3_build
%pyproject_wheel
%install
%py3_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}
mkdir -p %{buildroot}%{_prefix}/lib/koji-builder-plugins/
install -m 0644 koji_plugins/rpmautospec_builder.py \
%{buildroot}%{_prefix}/lib/koji-builder-plugins/
%py_byte_compile %{python3} %{buildroot}%{_prefix}/lib/koji-builder-plugins/
%if ! (0%{?fedora} >= 40 || 0%{?rhel} >= 10)
# RPM macros
%if %{with rpmmacropkg}
mkdir -p %{buildroot}%{rpmmacrodir}
install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/
%endif
@ -131,6 +108,19 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/
--numprocesses=auto
%endif
%files -n python3-%{canonicalname} -f %{pyproject_files}
%doc README.rst
%files -n %{canonicalname}
%{_bindir}/rpmautospec
%files -n koji-builder-plugin-rpmautospec
%{_prefix}/lib/koji-builder-plugins/*
%if %{with rpmmacropkg}
%files -n rpmautospec-rpm-macros
%{rpmmacrodir}/macros.rpmautospec
%endif
%changelog
%autochangelog

View File

@ -1 +1 @@
SHA512 (rpmautospec-0.3.5.tar.gz) = 5a692f0b6916ff77b1d86d5518801aa64e48844e532af40c378e61415f5a407dc9d53adac58a584e6e9ad8b13f606b8ef42f852117b5ee2fb068819bbf138743
SHA512 (rpmautospec-0.3.6.tar.gz) = 3e2ff487925c8de2cb00afcebb2aa8125164774486b41acedc2d43f8b9a5e1fac215cfda9dd881fc335db27992c74badb507a783ad86f8a2c6b80231cefc59ec