Fix FTBFS for redhat-rpm-config v260 and later

This commit is contained in:
Björn Esser 2023-07-06 15:11:26 +02:00
parent 0c33c34b3a
commit 91fff81fc3
No known key found for this signature in database
GPG Key ID: F52E98007594C21D

View File

@ -53,7 +53,10 @@
%bcond_without X11_test %bcond_without X11_test
# Do not build non-lto objects to reduce build time significantly. # Do not build non-lto objects to reduce build time significantly.
%global optflags %(echo '%{optflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g') %global build_cflags %(echo '%{build_cflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g')
%global build_cxxflags %(echo '%{build_cxxflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g')
%global build_fflags %(echo '%{build_fflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g')
%global build_fcflags %(echo '%{build_fflags}' | sed -e 's!-ffat-lto-objects!-fno-fat-lto-objects!g')
# Place rpm-macros into proper location # Place rpm-macros into proper location
%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
@ -69,7 +72,7 @@
%global patch_version 0 %global patch_version 0
# For handling bump release by rpmdev-bumpspec and mass rebuild # For handling bump release by rpmdev-bumpspec and mass rebuild
%global baserelease 1 %global baserelease 2
# Set to RC version if building RC, else comment out. # Set to RC version if building RC, else comment out.
%global rcsuf rc4 %global rcsuf rc4
@ -553,6 +556,9 @@ popd
%changelog %changelog
* Thu Jul 06 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0~rc4-2
- Fix FTBFS for redhat-rpm-config v260 and later
* Fri Jun 30 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0~rc4-1 * Fri Jun 30 2023 Björn Esser <besser82@fedoraproject.org> - 3.27.0~rc4-1
- cmake-3.27.0-rc4 - cmake-3.27.0-rc4
Fixes rhbz#2218941 Fixes rhbz#2218941