From 8d75af4de78dd6c0d5960ce59640caaf6a8189e5 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 8 Jul 2024 16:01:31 +1000 Subject: [PATCH] ci: correct evaluation of buildsubdir in pcp.spec.in, fixes rawhide --- build/rpm/pcp.spec.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/rpm/pcp.spec.in b/build/rpm/pcp.spec.in index e33a19055b..d0c3d68636 100755 --- a/build/rpm/pcp.spec.in +++ b/build/rpm/pcp.spec.in @@ -2304,8 +2304,6 @@ This package contains configuration tweaks and files to increase metrics gathering frequency, several extended pmlogger configurations, as well as automated pmie diagnosis, alerting and self-healing for the localhost. -%global __strip %{_builddir}/%{?buildsubdir}/build/rpm/custom-strip - %prep %setup -q @@ -2314,6 +2312,9 @@ automated pmie diagnosis, alerting and self-healing for the localhost. rm -Rf $RPM_BUILD_ROOT %build +# the buildsubdir macro gets defined in %%setup and is apparently only available in the next step (i.e. the %%build step) +%global __strip %{_builddir}/%{?buildsubdir}/build/rpm/custom-strip + # fix up build version _build=`echo %{release} | sed -e 's/\..*$//'` sed -i "/PACKAGE_BUILD/s/=[0-9]*/=$_build/" VERSION.pcp