From 6caf91425bb585b5181cc2ff2b903918a4cf67d6 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 4 Aug 2023 20:16:38 +0300 Subject: [PATCH] import pcp-6.0.1-5.el9_2 --- .gitignore | 1 + .pcp.metadata | 1 + SPECS/pcp.spec | 7 ++++++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index de3f2f2..a293e03 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ SOURCES/pcp-6.0.1.src.tar.gz +SOURCES/redhat-bugzilla-2219731-hacluster-metrics.patch diff --git a/.pcp.metadata b/.pcp.metadata index 311607a..b5e38e2 100644 --- a/.pcp.metadata +++ b/.pcp.metadata @@ -1 +1,2 @@ 4f405e26a6c651b2f094134e0648cd5fd201d310 SOURCES/pcp-6.0.1.src.tar.gz +bb84c58586e078343c975ed61a8b53d4fd4393e8 SOURCES/redhat-bugzilla-2219731-hacluster-metrics.patch diff --git a/SPECS/pcp.spec b/SPECS/pcp.spec index e2fd045..97eba4b 100644 --- a/SPECS/pcp.spec +++ b/SPECS/pcp.spec @@ -1,6 +1,6 @@ Name: pcp Version: 6.0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: System-level performance monitoring and performance management License: GPLv2+ and LGPLv2+ and CC-BY URL: https://pcp.io @@ -10,6 +10,7 @@ Source0: %{artifactory}/pcp-source-release/pcp-%{version}.src.tar.gz Patch0: redhat-bugzilla-2117074-vendored_vmlinux.h.patch Patch1: redhat-bugzilla-2117074-ppc_arm_vmlinux.h.patch +Patch2: redhat-bugzilla-2219731-hacluster-metrics.patch # The additional linker flags break out-of-tree PMDAs. # https://bugzilla.redhat.com/show_bug.cgi?id=2043092 @@ -2292,6 +2293,7 @@ updated policy package. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build # the buildsubdir macro gets defined in %%setup and is apparently only available in the next step (i.e. the %%build step) @@ -3367,6 +3369,9 @@ fi %files zeroconf -f pcp-zeroconf-files.rpm %changelog +* Mon Jul 17 2023 Nathan Scott - 6.0.1-5 +- Fix hacluster metrics with current Pacemaker (BZ 2222858) + * Tue Jan 17 2023 Nathan Scott - 6.0.1-4 - Rebuild for dependency on new version of libbpf (BZ 2159276)