Don’t use %py_dist_name macro

This makes the spec file robust against it being undefined, in case the
respective macro package is missing when the SRPM is built.

Also, explain the xdist conditional better.

[skip changelog]

Signed-off-by: Nils Philippsen <nils@redhat.com>
This commit is contained in:
Nils Philippsen 2024-02-09 11:37:50 +01:00
parent 9cf1aaf7b0
commit d997a3d16a

View File

@ -1,4 +1,4 @@
# when bootstrapping Python, pytest-xdist is not yet available # The pytest-xdist package is not available when bootstrapping or for EL builds
%bcond xdist %{undefined rhel} %bcond xdist %{undefined rhel}
# Package the placeholder rpm-macros (moved to redhat-rpm-config in F40) # Package the placeholder rpm-macros (moved to redhat-rpm-config in F40)
@ -16,15 +16,14 @@
%endif %endif
%global srcname rpmautospec %global srcname rpmautospec
%global canonicalname %{py_dist_name %{srcname}}
Name: python-%{canonicalname} Name: python-%{srcname}
Version: 0.6.1 Version: 0.6.1
Release: %autorelease Release: %autorelease
Summary: Package and CLI tool to generate release fields and changelogs Summary: Package and CLI tool to generate release fields and changelogs
License: MIT License: MIT
URL: https://github.com/fedora-infra/%{canonicalname} URL: https://github.com/fedora-infra/%{srcname}
Source0: https://github.com/fedora-infra/%{canonicalname}/releases/download/%{version}/%{canonicalname}-%{version}.tar.gz Source0: https://github.com/fedora-infra/%{srcname}/releases/download/%{version}/%{srcname}-%{version}.tar.gz
BuildArch: noarch BuildArch: noarch
BuildRequires: git BuildRequires: git
@ -45,17 +44,17 @@ A package and CLI tool to generate RPM release fields and changelogs.}
%description %_description %description %_description
%package -n python3-%{canonicalname} %package -n python3-%{srcname}
Summary: %{summary} Summary: %{summary}
%{?python_provide:%python_provide python3-%{srcname}} %{?python_provide:%python_provide python3-%{srcname}}
%description -n python3-%{canonicalname} %_description %description -n python3-%{srcname} %_description
%package -n %{canonicalname} %package -n %{srcname}
Summary: CLI tool for generating RPM releases and changelogs Summary: CLI tool for generating RPM releases and changelogs
Requires: python3-%{canonicalname} = %{version}-%{release} Requires: python3-%{srcname} = %{version}-%{release}
%description -n %{canonicalname} %description -n %{srcname}
CLI tool for generating RPM releases and changelogs CLI tool for generating RPM releases and changelogs
%if %{with rpmmacropkg} %if %{with rpmmacropkg}
@ -102,10 +101,10 @@ install -m 644 rpm/macros.d/macros.rpmautospec %{buildroot}%{rpmmacrodir}/
--numprocesses=auto --numprocesses=auto
%endif %endif
%files -n python3-%{canonicalname} -f %{pyproject_files} %files -n python3-%{srcname} -f %{pyproject_files}
%doc README.rst %doc README.rst
%files -n %{canonicalname} %files -n %{srcname}
%{_bindir}/rpmautospec %{_bindir}/rpmautospec
%if %{with rpmmacropkg} %if %{with rpmmacropkg}