From 97350ffbfb1799206fc7fa14c874d098792bc08c Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Mon, 15 May 2023 09:22:55 +1000
Subject: [PATCH] Update to latest community sources

---
 pcp.spec | 16 +++++-----------
 sources  |  2 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/pcp.spec b/pcp.spec
index 5d58796..8f247d6 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,5 +1,5 @@
 Name:    pcp
-Version: 6.0.3
+Version: 6.0.4
 Release: 1%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2+ and CC-BY
@@ -94,7 +94,7 @@ Source0: %{artifactory}/pcp-source-release/pcp-%{version}.src.tar.gz
 
 # support for pmdabpf, check bcc.spec for supported architectures of libbpf-tools
 %if 0%{?fedora} >= 37 || 0%{?rhel} > 8
-%ifarch x86_64 ppc64 ppc64le aarch64
+%ifarch x86_64 %{power64} aarch64
 %global disable_bpf 0
 %else
 %global disable_bpf 1
@@ -2705,7 +2705,6 @@ chown -R pcpqa:pcpqa %{_testsdir} 2>/dev/null
 %if !%{disable_systemd}
     systemctl restart pmcd pmlogger >/dev/null 2>&1
     systemctl enable pmcd pmlogger >/dev/null 2>&1
-    systemctl enable pmlogger_daily_report.timer >/dev/null 2>&1
 %else
     /sbin/chkconfig --add pmcd >/dev/null 2>&1
     /sbin/chkconfig --add pmlogger >/dev/null 2>&1
@@ -2977,14 +2976,6 @@ exit 0
 %preun pmda-weblog
 %{pmda_remove "$1" "weblog"}
 
-%if !%{disable_systemd}
-%preun zeroconf
-if [ "$1" -eq 0 ]
-then
-    %systemd_preun pmlogger_daily_report.timer pmlogger_daily_report.service
-fi
-%endif
-
 %preun
 if [ "$1" -eq 0 ]
 then
@@ -3371,6 +3362,9 @@ fi
 %files zeroconf -f pcp-zeroconf-files.rpm
 
 %changelog
+* Mon May 15 2023 Nathan Scott <nathans@redhat.com> - 6.0.4-1
+- Rework LOCALHOSTNAME handling in control files (BZ 2172892)
+
 * Thu Feb 23 2023 Nathan Scott <nathans@redhat.com> - 6.0.3-1
 - Update to latest PCP sources.
 
diff --git a/sources b/sources
index e5b4729..68b645b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pcp-6.0.3.src.tar.gz) = f012c1e45f72874952af480bab9044957565e79b5c75cba08cb9466ce1f497dae89fbee036f2bd2802c937107b3784a9876ffd1f94a8b1f346d1fe4e83d72f64
+SHA512 (pcp-6.0.4.src.tar.gz) = 36d0743d680830b1bfaaef7bedb63e95a1a015e1d27643c27119d31b760ba90c9160c8197e36f2f62061d7c34e12ef7267251a5d8e6304ea7a9a4f6daf1165b1