diff --git a/.gitignore b/.gitignore index 052fd3e..4fb7ff5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ SOURCES/pcp-5.3.7.src.tar.gz +SOURCES/redhat-bugzilla-2219731-hacluster-metrics.patch diff --git a/.pcp.metadata b/.pcp.metadata index e64a399..0b967ee 100644 --- a/.pcp.metadata +++ b/.pcp.metadata @@ -1 +1,2 @@ a0a05bf501b016cb859fb211ae60ce18be2bbd99 SOURCES/pcp-5.3.7.src.tar.gz +bb84c58586e078343c975ed61a8b53d4fd4393e8 SOURCES/redhat-bugzilla-2219731-hacluster-metrics.patch diff --git a/SPECS/pcp.spec b/SPECS/pcp.spec index 73f9e7a..115ab28 100644 --- a/SPECS/pcp.spec +++ b/SPECS/pcp.spec @@ -1,6 +1,6 @@ Name: pcp Version: 5.3.7 -Release: 16%{?dist} +Release: 17%{?dist} Summary: System-level performance monitoring and performance management License: GPLv2+ and LGPLv2+ and CC-BY URL: https://pcp.io @@ -18,7 +18,8 @@ Patch7: redhat-bugzilla-2093751-sudoers-docs.patch Patch8: redhat-bugzilla-2101574-farm-config.patch Patch9: redhat-bugzilla-2135314-pmfind-fix.patch Patch10: redhat-bugzilla-2139012-pmdasnmp-config.patch -Patch11: redhat-build-jsonsl.patch +Patch11: redhat-bugzilla-2219731-hacluster-metrics.patch +Patch12: redhat-build-jsonsl.patch # The additional linker flags break out-of-tree PMDAs. # https://bugzilla.redhat.com/show_bug.cgi?id=2043092 @@ -2299,6 +2300,7 @@ updated policy package. %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %build # the buildsubdir macro gets defined in %setup and is apparently only available in the next step (i.e. the %build step) @@ -3370,9 +3372,12 @@ fi %files zeroconf -f pcp-zeroconf-files.rpm %changelog -* Wed Jul 26 2023 MSVSphere Packaging Team - 5.3.7-16 +* Wed Jul 26 2023 MSVSphere Packaging Team - 5.3.7-17 - Rebuilt for MSVSphere 8.8 +* Mon Jul 17 2023 Nathan Scott - 5.3.7-17 +- Fix hacluster metrics with current Pacemaker (BZ 2222857) + * Thu Nov 17 2022 Nathan Scott - 5.3.7-16 - Ensure SNMP metrics config symlink installed (BZ 2139012)