rpms/cmake
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Declarative %generate_buildrequires: Keep the BRs stable

Browse source 
Make the rpm-macros implementation add new BuildRequires, but not removing some.
This makes the individual rounds of %generate_buildrequires behave more predictably.

Nothing says the previous approach is wrong, but is might blow up unexpectedly.
This commit is contained in:
Miro Hrončok 2025-12-12 14:28:38 +01:00
commit aaa289ec8e
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cmake.spec
View file

@ -69,7 +69,7 @@
%global patch_version 10
# For handling bump release by rpmdev-bumpspec and mass rebuild
%global baserelease 2
%global baserelease 3
# Set to RC version if building RC, else comment out.
#%%global rcsuf rc3
@ -600,6 +600,9 @@ popd
%changelog
* Fri Dec 12 2025 Miro Hrončok <mhroncok@redhat.com> - 3.31.10-3
- Declarative %%generate_buildrequires: Keep the BRs stable
* Thu Dec 11 2025 Neal Gompa <ngompa@fedoraproject.org> - 3.31.10-2
- macros: Enable support for RPM 4.20+ declarative buildsystem feature

2
macros.cmake.in
View file

@ -58,7 +58,7 @@
# Declarative buildsystem macros (usable with rpm >= 4.20)
# https://rpm-software-management.github.io/rpm/manual/buildsystem.html
%cmake_generate_buildrequires(-) echo "cmake"
%cmake_generate_buildrequires(-) echo "cmake-rpm-macros"; echo "cmake"
%buildsystem_cmake_generate_buildrequires() %cmake_generate_buildrequires %{*}
%buildsystem_cmake_conf() %cmake %{*}