Skip to content

Commit

Permalink
ci: correct evaluation of buildsubdir in pcp.spec.in, fixes rawhide
Browse files Browse the repository at this point in the history
  • Loading branch information
natoscott committed Jul 8, 2024
1 parent 29e2661 commit 8d75af4
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions build/rpm/pcp.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit 8d75af4

Please sign in to comment.