Fix invalid path in pmie.service unit file (BZ 2079793)

This commit is contained in:
Nathan Scott 2022-06-17 10:57:54 +10:00
parent 669de448ed
commit c98c5df92e
2 changed files with 27 additions and 1 deletions

View File

@ -1,6 +1,6 @@
Name: pcp
Version: 5.3.7
Release: 3%{?dist}
Release: 4%{?dist}
Summary: System-level performance monitoring and performance management
License: GPLv2+ and LGPLv2+ and CC-BY
URL: https://pcp.io
@ -8,6 +8,8 @@ URL: https://pcp.io
%global artifactory https://performancecopilot.jfrog.io/artifactory
Source0: %{artifactory}/pcp-source-release/pcp-%{version}.src.tar.gz
Patch0: redhat-bugzilla-2079793.patch
# The additional linker flags break out-of-tree PMDAs.
# https://bugzilla.redhat.com/show_bug.cgi?id=2043092
%undefine _package_note_flags
@ -2285,6 +2287,7 @@ updated policy package.
%prep
%setup -q
%patch0 -p1
%build
# the buildsubdir macro gets defined in %setup and is apparently only available in the next step (i.e. the %build step)
@ -3342,6 +3345,9 @@ PCP_LOG_DIR=%{_logsdir}
%files zeroconf -f pcp-zeroconf-files.rpm
%changelog
* Fri Jun 17 2022 Nathan Scott <nathans@redhat.com> - 5.3.7-4
- Fix invalid path in pmie.service unit file (BZ 2079793)
* Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 5.3.7-3
- Rebuilt for Python 3.11

View File

@ -0,0 +1,20 @@
commit d2dff63a0f4d4eacafa16c561b4b9e32c59f248c
Author: Nathan Scott <nathans@redhat.com>
Date: Fri Apr 8 08:19:32 2022 +1000
build: fix translation of PCP_SYSCONFIG_DIR in pmie unit file
Resolves Red Hat BZ #2072971
diff --git a/src/pmie/GNUmakefile b/src/pmie/GNUmakefile
index e0525d49e8..dc182e444a 100644
--- a/src/pmie/GNUmakefile
+++ b/src/pmie/GNUmakefile
@@ -80,6 +80,7 @@ pmie.service : pmie.service.in
$(SED) <$< >$@ \
-e 's;@PCP_RC_DIR@;'$(PCP_RC_DIR)';' \
-e 's;@PCP_RUN_DIR@;'$(PCP_RUN_DIR)';' \
+ -e 's;@PCP_SYSCONFIG_DIR@;'$(PCP_SYSCONFIG_DIR)';' \
# END
pmie_farm.service : pmie_farm.service.in