From 91fff81fc3d6a9d37aab6c1f8a986b4dfb72158c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Thu, 6 Jul 2023 15:11:26 +0200 Subject: [PATCH] Fix FTBFS for redhat-rpm-config v260 and later --- cmake.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake.spec b/cmake.spec index ef563d7..88f523b 100644 --- a/cmake.spec +++ b/cmake.spec @@ -53,7 +53,10 @@ %bcond_without X11_test # 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 %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) @@ -69,7 +72,7 @@ %global patch_version 0 # 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. %global rcsuf rc4 @@ -553,6 +556,9 @@ popd %changelog +* Thu Jul 06 2023 Björn Esser - 3.27.0~rc4-2 +- Fix FTBFS for redhat-rpm-config v260 and later + * Fri Jun 30 2023 Björn Esser - 3.27.0~rc4-1 - cmake-3.27.0-rc4 Fixes rhbz#2218941