rpms/python-rpm-macros
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

%python_wheel_inject_sbom: Hardcode the purl of this tool instead of constructing it at runtime

Browse source 
That way, when  python-rpm-macros from Fedora is installed on other distro,
the purl will still say pkg:rpm/fedora/python-rpm-macros,
or the other way around.
This commit is contained in:
Miro Hrončok 2026-03-17 16:24:34 +01:00
commit bc877eff40
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
macros.python-wheel-sbom
View file

@ -52,8 +52,8 @@
# Note that epoch needs special handling, see https://github.com/package-url/purl-spec/issues/69
# and https://redhatproductsecurity.github.io/security-data-guidelines/purl/
%__python_wheel_purl pkg:rpm/%{__python_wheel_dist_purl_namespace}/%{name}@%{version}-%{release}?%{?epoch:epoch=%{epoch}&}arch=src
%__python_wheel_macros_verrel %(rpm -q python-rpm-macros --qf '%%{version}-%%{release}')
%__python_wheel_macros_purl pkg:rpm/%{__python_wheel_dist_purl_namespace}/python-rpm-macros@%{__python_wheel_macros_verrel}?arch=src
%__python_wheel_macros_verrel PLACEHOLDER
%__python_wheel_macros_purl PLACEHOLDER
# The purl namespace used above

19
python-rpm-macros.spec
View file

@ -54,7 +54,7 @@ License: MIT AND PSF-2.0 AND GPL-2.0-or-later
%{load:macros.python-srpm}
%endif
Version: %{__default_python3_version}
Release: 11%{?dist}
Release: 12%{?dist}
BuildArch: noarch
@ -139,10 +139,24 @@ install -m 755 brp-* %{buildroot}%{_rpmconfigdir}/redhat/
%global __brp_fix_pyc_reproducibility %{add_buildroot __brp_fix_pyc_reproducibility}
%global __brp_python_rpm_in_distinfo %{add_buildroot __brp_python_rpm_in_distinfo}
# Bake in the version-release and purl namespace of this tool for %%python_wheel_inject_sbom.
# That way, even when this is installed on a different distro, the purl will still be applicable.
# We need to load the macro file to know the value of %%__python_wheel_dist_purl_namespace first.
# When the source does not exist, something is parsing this spec without %%_sourcedir macro properly set,
# but we don't have to do anything then because that cannot happen during the build.
%if %{exists:%{SOURCE106}}
%{load:%{SOURCE106}}
sed -i \
-e 's|%%__python_wheel_macros_verrel PLACEHOLDER|%%__python_wheel_macros_verrel %{version}-%{release}|' \
-e 's|%%__python_wheel_macros_purl PLACEHOLDER|%%__python_wheel_macros_purl pkg:rpm/%{__python_wheel_dist_purl_namespace}/python-rpm-macros@%%{__python_wheel_macros_verrel}?arch=src|' \
%{buildroot}%{rpmmacrodir}/macros.python-wheel-sbom
%endif
%check
# no macros in comments
grep -E '^#[^%%]*%%[^%%]' %{buildroot}%{rpmmacrodir}/macros.* && exit 1 || true
# no placeholders in macros
grep -iF PLACEHOLDER %{buildroot}%{rpmmacrodir}/macros.* && exit 1 || true
%files
@ -167,6 +181,9 @@ grep -E '^#[^%%]*%%[^%%]' %{buildroot}%{rpmmacrodir}/macros.* && exit 1 || true
%changelog
* Tue Mar 17 2026 Miro Hrončok <mhroncok@redhat.com> - 3.14-12
- %%python_wheel_inject_sbom: Hardcode the purl of this tool instead of constructing it at runtime
* Tue Mar 10 2026 Miro Hrončok <mhroncok@redhat.com> - 3.14-11
- %%python_wheel_inject_sbom: Add more metadata to the SBOM
- %%python_wheel_inject_sbom: Rename the SBOM file to limit the possibility of clashes