From 860d66d7de80c59738aa99d565fc1c0b5526cd52 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Nov 10 2020 23:38:10 +0000
Subject: Update to pcp-5.2.2 sources


---

diff --git a/pcp.spec b/pcp.spec
index 7e78b95..4669710 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,5 +1,5 @@
 Name:    pcp
-Version: 5.2.1
+Version: 5.2.2
 Release: 1%{?dist}
 Summary: System-level performance monitoring and performance management
 License: GPLv2+ and LGPLv2+ and CC-BY
@@ -1777,8 +1777,14 @@ URL: https://pcp.io
 Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
 %if !%{disable_python3}
 Requires: python3-pcp
+%if 0%{?rhel} == 0
+Requires: python3-pyodbc
+%endif
 %else
 Requires: %{__python2}-pcp
+%if 0%{?rhel} == 0
+Requires: %{__python2}-pyodbc
+%endif
 %endif
 %description pmda-mssql
 This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@@ -2058,10 +2064,13 @@ collecting metrics about web server logs.
 License: GPLv2+
 Summary: Performance Co-Pilot (PCP) Zeroconf Package
 URL: https://pcp.io
-Requires: pcp pcp-doc pcp-system-tools
-Requires: pcp-pmda-dm
+Requires: pcp = %{version}-%{release} pcp-libs = %{version}-%{release}
+Requires: pcp-system-tools = %{version}-%{release}
+Requires: pcp-doc = %{version}-%{release}
+Requires: pcp-pmda-dm = %{version}-%{release}
 %if !%{disable_python2} || !%{disable_python3}
-Requires: pcp-pmda-nfsclient pcp-pmda-openmetrics
+Requires: pcp-pmda-nfsclient = %{version}-%{release}
+Requires: pcp-pmda-openmetrics = %{version}-%{release}
 %endif
 %description zeroconf
 This package contains configuration tweaks and files to increase metrics
@@ -2886,6 +2895,7 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 %config %{_sysconfdir}/pcp.env
 %dir %{_confdir}/labels
 %dir %{_confdir}/labels/optional
+%config(noreplace) %{_confdir}/labels.conf
 %dir %{_confdir}/pipe.conf.d
 %dir %{_confdir}/pmcd
 %config(noreplace) %{_confdir}/pmcd/pmcd.conf
@@ -2913,7 +2923,6 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 %ghost %dir %attr(0775,pcp,pcp) %{_localstatedir}/run/pcp
 %{_localstatedir}/lib/pcp/config/pmafm
 %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmie
-%{_localstatedir}/lib/pcp/config/pmie
 %{_localstatedir}/lib/pcp/config/pmieconf
 %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmlogger
 %{_localstatedir}/lib/pcp/config/pmlogger/*
@@ -2940,7 +2949,7 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 %config(noreplace) %{_logconfdir}/zeroconf
 %config(noreplace) %{_confdir}/pmlogconf/zeroconf
 %config(noreplace) %{_confdir}/pmieconf/zeroconf
-%{_logsdir}/sa
+%dir %attr(0775,pcp,pcp) %{_logsdir}/sa
 
 #additional pmlogger config files
 
@@ -3430,11 +3439,14 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 %endif
 
 %changelog
+* Wed Nov 11 2020 Nathan Scott <nathans@redhat.com> - 5.2.2-1
+- Update to latest PCP sources.
+
 * Fri Sep 25 2020 Nathan Scott <nathans@redhat.com> - 5.2.1-1
 - Update to latest PCP sources.
 
 * Sat Aug 08 2020 Mark Goodwin <mgoodwin@redhat.com> - 5.2.0-1
-- Rearrange installed /var file layouts extensively (BZ 1827441)
+- FHS compliance in installed /var file locations (BZ 1827441)
 - pmproxy intermittently crashes at uv_timer_stop (BZ 1789312)
 - Update to latest PCP sources.
 - Re-enabled LTO.
@@ -3455,14 +3467,14 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 
 * Fri Apr 24 2020 Mark Goodwin <mgoodwin@redhat.com> - 5.1.0-1
 - pmdakvm: debugfs access is restricted (BZ 1824297)
-- error starting pmlogger; pid file not owned by root (BZ 1761962)
+- Error starting pmlogger; pid file not owned by root (BZ 1761962)
 - Update to latest PCP sources.
 
 * Wed Mar 11 2020 Mark Goodwin <mgoodwin@redhat.com> - 5.0.3-3
 - Resolve pcp-selinux issues causing services failures - (BZ 1810458)
 
 * Mon Mar 02 2020 Mark Goodwin <mgoodwin@redhat.com> - 5.0.3-2
-- fix typo in Requires: perl-Time-HiRes affecting pcp-pmda-bind2
+- Fix typo in Requires: perl-Time-HiRes affecting pcp-pmda-bind2
 
 * Thu Feb 27 2020 Mark Goodwin <mgoodwin@redhat.com> - 5.0.3-1
 - Avoid python ctypes bitfield struct on-stack (BZ 1800685)
@@ -3482,8 +3494,8 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 - Update to latest PCP sources.
 
 * Sun Oct 20 2019 Mark Goodwin <mgoodwin@redhat.com> - 5.0.0-2
-- various spec fixes for pmdastatsd
-- add patch1 to fix pmdastatsd build on rawhide
+- Various spec fixes for pmdastatsd
+- Add patch1 to fix pmdastatsd build on rawhide
 
 * Fri Oct 11 2019 Mark Goodwin <mgoodwin@redhat.com> - 5.0.0-1
 - Update to latest PCP sources.
diff --git a/sources b/sources
index 24e3d59..f8b030e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pcp-5.2.1.src.tar.gz) = 733fdc7e0e3bcbd50f25f6644565b1164caae5724c9a006482056eb8fdbc997941073aae92d28f2b37808a096c06d38253de069a4f4007c8a8033c7a93dc0a93
+SHA512 (pcp-5.2.2.src.tar.gz) = 1a302c12879c3beddf102401bde497ad6e5eba60bf2f8260154510fced526b015b72f769c94504e344cadaff63def10ed6d4323ed59b9d56b2aef88d5c56b2a4