X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=pcp.spec;h=f4f99a5932e45d4aaa3fbb18942290a5c6585535;hb=HEAD;hp=d2791be2a2081c1d399d42078b826f2eac732098;hpb=2c5674f5fb513d2f4999b92589439e113a1a284e;p=packages%2Fpcp.git

diff --git a/pcp.spec b/pcp.spec
index d2791be..f4f99a5 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,29 +1,31 @@
 # TODO:
+# - TONS of unpackaged files
 # - PLDify init scripts
 # - build pmview (BR: openinventor?)
 # - /var/lib/pcp looks like mess, configs/variable data/scripts/ELFs (successively resolved upstream)
 # NOTE: user/group must be in -libs because of /var/run/pcp, needed for Make.stdpmid in post
+# - package zabbix agent
+# - package zsh completions
 #
 # Conditional build:
-%bcond_without	qt		# Qt 4.x based GUI
+%bcond_without	qt		# Qt 5.x based GUI
 %bcond_without	systemtap	# systemtap/dtrace support
 
-%include	/usr/lib/rpm/macros.perl
 Summary:	Performance Co-Pilot - system level performance monitoring and management
 Summary(pl.UTF-8):	Performance Co-Pilot - monitorowanie i zarządzanie wydajnością na poziomie systemu
 Name:		pcp
-Version:	4.1.0
-Release:	0.1
+Version:	5.3.6
+Release:	5
 License:	LGPL v2.1 (libraries), GPL v2 (the rest)
 Group:		Applications/System
-Source0:	https://github.com/performancecopilot/pcp/archive/%{version}.tar.gz
-# Source0-md5:	12e82f2464452e74d0104caf964df994
-
+Source0:	https://github.com/performancecopilot/pcp/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	c753c01cad55719e67fc62b7a20bc0ef
+Patch0:		build-man.patch
 Patch1:		%{name}-opt.patch
 Patch2:		%{name}-nspr.patch
 Patch3:		%{name}-saslconfdir.patch
-Patch4:		%{name}-rpm.patch
 Patch5:		python-install.patch
+Patch6:		install-icons.patch
 URL:		http://pcp.io/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	avahi-devel
@@ -36,35 +38,46 @@ BuildRequires:	libatomic-devel
 BuildRequires:	libibmad-devel
 BuildRequires:	libibumad-devel
 BuildRequires:	libmicrohttpd-devel >= 0.9.10
+BuildRequires:	libuv-devel >= 1
 BuildRequires:	nspr-devel >= 4
 BuildRequires:	nss-devel >= 3
 BuildRequires:	openssl-devel
 BuildRequires:	perl-DBD-Pg
+BuildRequires:	perl-DBD-mysql
 BuildRequires:	perl-ExtUtils-MakeMaker
+BuildRequires:	perl-File-Slurp
+BuildRequires:	perl-JSON
+BuildRequires:	perl-Net-SNMP
+BuildRequires:	perl-XML-LibXML
 BuildRequires:	perl-base
+BuildRequires:	perl-libwww
 BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel >= 2.0
 BuildRequires:	python3-devel >= 1:3.2
+BuildRequires:	python3-psycopg2
 BuildRequires:	readline-devel
-BuildRequires:	rpm-devel >= 5
+BuildRequires:	rpm-devel
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
 BuildRequires:	systemd-devel
 %{?with_systemtap:BuildRequires:	systemtap-sdt-devel}
 %if %{with qt}
-BuildRequires:	QtAssistant-compat-devel >= 4.4
-BuildRequires:	QtCore-devel >= 4.4
-BuildRequires:	QtGui-devel >= 4.4
-BuildRequires:	QtSvg-devel >= 4.4
-BuildRequires:	qt4-build >= 4.4
-BuildRequires:	qt4-qmake >= 4.4
+BuildRequires:	Qt5Concurrent-devel
+BuildRequires:	Qt5Core-devel
+BuildRequires:	Qt5Gui-devel
+BuildRequires:	Qt5Network-devel
+BuildRequires:	Qt5PrintSupport-devel
+BuildRequires:	Qt5Svg-devel
+BuildRequires:	qt5-build
+BuildRequires:	qt5-qmake
 %endif
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	libmicrohttpd >= 0.9.10
 Requires:	perl-pcp = %{version}-%{release}
 Requires:	python-pcp = %{version}-%{release}
+Requires(post):	/usr/bin/gawk
 Suggests:	crondaemon
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -194,9 +207,7 @@ Summary:	bash-completion for PCP utilities
 Summary(pl.UTF-8):	Bashowe uzupełnianie nazw dla narzędzi PCP
 Group:		Applications/Shells
 Requires:	bash-completion
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description -n bash-completion-pcp
 bash-completion for PCP utilities.
@@ -219,12 +230,38 @@ Sondy systemtap/dtrace dla PCP.
 
 %prep
 %setup -q
-
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
+%patch6 -p1
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+perl(\s|$),#!%{__perl}\1,' \
+      src/ganglia2pcp/ganglia2pcp \
+      src/iostat2pcp/iostat2pcp \
+      src/mrtg2pcp/mrtg2pcp \
+      src/perl/LogSummary/extract.pl \
+      src/perl/MMV/server.pl \
+      src/pmdas/oracle/connect.pl \
+      src/pmdas/redis/pmdaredis.pl \
+      src/pmdas/simple/pmdasimple.perl \
+      src/sar2pcp/sar2pcp \
+      src/sheet2pcp/sheet2pcp \
+      src/pmdas/perfevent/perfevent-makerewrite.pl
+
+find \( -name '*.py' -o -name '*.python' \) -print0 | xargs -0 \
+      %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+pmpython(\s|$),#!%{_bindir}/pmpython\1,'
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+pmpython(\s|$),#!%{_bindir}/pmpython\1,' \
+      src/pmdas/haproxy/connect \
+      src/pmdas/json/generate_ceph_metadata \
+      src/pmdas/libvirt/connect \
+      src/pmdas/netcheck/pyprep
+
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\1,' \
+      src/pmdas/bash/test-child.sh \
+      src/pmdas/bash/test-trace.sh
 
 %build
 QTDIR=%{_libdir}/qt5; export QTDIR
@@ -254,10 +291,6 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}
 
 install -p src/pmns/stdpmid $RPM_BUILD_ROOT/var/lib/pcp/pmns
 
-# omitted by make install
-[ ! -f $RPM_BUILD_ROOT%{_mandir}/man1/pmdarpm.1 ] || exit 1
-cp -p src/pmdas/rpm/pmdarpm.1 $RPM_BUILD_ROOT%{_mandir}/man1
-
 install -d $RPM_BUILD_ROOT%{systemdtmpfilesdir}
 cat >$RPM_BUILD_ROOT%{systemdtmpfilesdir}/pcp.conf <<EOF
 d /var/run/pcp 0775 pcp pcp -
@@ -270,15 +303,17 @@ EOF
 %{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/{pmdaaix,pmdakernel}.1
 ln -snf pmdakernel.1 $RPM_BUILD_ROOT%{_mandir}/man1/pmdalinux.1
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{pmdadarwin,pmdafreebsd,pmdanetbsd,pmdasolaris,pmdawindows}.1
+# already present as pcp-dstat.1 and conflicts with dstat package
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/dstat.1*
 # could be eventually packaged in examplesdir / docdir resp.
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/pcp/{demos,examples}
 # tests (package in -testsuite using pcpqa:pcpqa UID/GID?)
 %{__rm} -r $RPM_BUILD_ROOT/var/lib/pcp/testsuite
-# some files packaged as %doc, the rest useless in package
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 # packaged as %doc
 %{__rm} -rf html
 %{__mv} $RPM_BUILD_ROOT%{_docdir}/pcp-doc/html html
+# some files packaged as %doc, the rest useless in package
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-{%{version},doc}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -305,20 +340,22 @@ fi
 %doc CHANGELOG README.md
 %attr(755,root,root) %{_bindir}/collectl2pcp
 %attr(755,root,root) %{_bindir}/dbpmda
+%attr(755,root,root) %{_bindir}/dstat
 %attr(755,root,root) %{_bindir}/ganglia2pcp
 %attr(755,root,root) %{_bindir}/genpmda
 %attr(755,root,root) %{_bindir}/iostat2pcp
 %attr(755,root,root) %{_bindir}/mrtg2pcp
 %attr(755,root,root) %{_bindir}/pcp
 %attr(755,root,root) %{_bindir}/pcp2csv
+%attr(755,root,root) %{_bindir}/pcp2elasticsearch
 %attr(755,root,root) %{_bindir}/pcp2graphite
 %attr(755,root,root) %{_bindir}/pcp2influxdb
 %attr(755,root,root) %{_bindir}/pcp2json
+%attr(755,root,root) %{_bindir}/pcp2spark
 %attr(755,root,root) %{_bindir}/pcp2xml
 %attr(755,root,root) %{_bindir}/pmafm
 %attr(755,root,root) %{_bindir}/pmclient
 %attr(755,root,root) %{_bindir}/pmclient_fg
-%attr(755,root,root) %{_bindir}/pmcollectl
 %attr(755,root,root) %{_bindir}/pmdate
 %attr(755,root,root) %{_bindir}/pmdbg
 %attr(755,root,root) %{_bindir}/pmdiff
@@ -344,6 +381,7 @@ fi
 %attr(755,root,root) %{_bindir}/pmprobe
 %attr(755,root,root) %{_bindir}/pmpython
 %attr(755,root,root) %{_bindir}/pmrep
+%attr(755,root,root) %{_bindir}/pmseries
 %attr(755,root,root) %{_bindir}/pmsocks
 %attr(755,root,root) %{_bindir}/pmstat
 %attr(755,root,root) %{_bindir}/pmstore
@@ -351,13 +389,14 @@ fi
 %attr(755,root,root) %{_bindir}/pmval
 %attr(755,root,root) %{_bindir}/sar2pcp
 %attr(755,root,root) %{_bindir}/sheet2pcp
-%attr(755,root,root) %{_libexecdir}/pcp/bin/chkhelp
+%dir %{_libexecdir}/pcp/bin/discover
 %attr(755,root,root) %{_libexecdir}/pcp/bin/discover/pcp-kube-pods
+%attr(755,root,root) %{_libexecdir}/pcp/bin/chkhelp
+%attr(755,root,root) %{_libexecdir}/pcp/bin/find-filter
 %attr(755,root,root) %{_libexecdir}/pcp/bin/install-sh
 %attr(755,root,root) %{_libexecdir}/pcp/bin/mkaf
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pcp-atop
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pcp-atopsar
-%attr(755,root,root) %{_libexecdir}/pcp/bin/pcp-collectl
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pcp-dmcache
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pcp-dstat
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pcp-free
@@ -377,6 +416,7 @@ fi
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmcd
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmcd_wait
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmconfig
+%attr(755,root,root) %{_libexecdir}/pcp/bin/pmfind_check
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmgetopt
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmhostname
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmie_check
@@ -385,7 +425,6 @@ fi
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmiestatus
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmlock
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmlogconf
-%attr(755,root,root) %{_libexecdir}/pcp/bin/pmlogconf-setup
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmlogextract
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmlogger
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmlogger_check
@@ -394,7 +433,6 @@ fi
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmlogger_merge
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmlogreduce
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmlogrewrite
-%attr(755,root,root) %{_libexecdir}/pcp/bin/pmmgr
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmnewlog
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmnsadd
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmnsdel
@@ -403,7 +441,6 @@ fi
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmproxy
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmsignal
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmsleep
-%attr(755,root,root) %{_libexecdir}/pcp/bin/pmwebd
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmwtf
 %attr(755,root,root) %{_libexecdir}/pcp/bin/telnet-probe
 %dir %{_datadir}/pcp
@@ -416,9 +453,6 @@ fi
 %{_datadir}/pcp/lib/rc-proc.sh
 %{_datadir}/pcp/lib/rc-proc.sh.minimal
 %{_datadir}/pcp/lib/utilproc.sh
-%config(noreplace) %verify(not md5 mtime size) /etc/cron.d/pcp-pmie
-%config(noreplace) %verify(not md5 mtime size) /etc/cron.d/pcp-pmlogger
-%config(noreplace) %verify(not md5 mtime size) /etc/cron.d/pcp-pmlogger-daily-report
 %config(noreplace) %verify(not md5 mtime size) /etc/sasl/pmcd.conf
 %dir %{_sysconfdir}/pcp
 %dir %{_sysconfdir}/pcp/discover
@@ -427,6 +461,8 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/aio
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/cpu
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/disk
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/dm
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/entropy
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/freespace
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/fs
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/int
@@ -434,11 +470,14 @@ fi
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/ipc
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/load
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/locks
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/md
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/mem
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/memcache
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/mysql
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/net
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/nfs
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/page
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/part
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/postfix
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/proc
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/dstat/redis
@@ -461,43 +500,45 @@ fi
 %attr(664,pcp,pcp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmlogger/control
 %attr(775,root,pcp) %dir %{_sysconfdir}/pcp/pmlogger/control.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmlogger/control.d/local
-%dir %{_sysconfdir}/pcp/pmmgr
-%doc %{_sysconfdir}/pcp/pmmgr/README
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmmgr/pmie
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmmgr/pmieconf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmmgr/pmlogconf
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmmgr/pmlogger
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmmgr/pmlogmerge
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmmgr/pmlogmerge-granular
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmmgr/pmlogmerge-rewrite
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmmgr/pmmgr.options
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmmgr/disk-full-retention
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmmgr/disk-full-threshold
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmmgr/pmlogreduce
-%config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmmgr/target-discovery.example-avahi
 %dir %{_sysconfdir}/pcp/pmproxy
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmproxy/pmproxy.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmproxy/pmproxy.options
-%dir %{_sysconfdir}/pcp/pmrep
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmrep/pmrep.conf
-%dir %{_sysconfdir}/pcp/pmwebd
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmwebd/pmwebd.options
+%dir %{_sysconfdir}/pcp/pmseries
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmseries/pmseries.conf
+%dir %{_sysconfdir}/pcp/snmp
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/snmp/snmp.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pmcd
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pmfind
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pmie_timers
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pmlogger
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pmlogger_timers
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/pmproxy
 %attr(754,root,root) /etc/rc.d/init.d/pcp
 %attr(754,root,root) /etc/rc.d/init.d/pmcd
 %attr(754,root,root) /etc/rc.d/init.d/pmie
 %attr(754,root,root) /etc/rc.d/init.d/pmlogger
-%attr(754,root,root) /etc/rc.d/init.d/pmmgr
 %attr(754,root,root) /etc/rc.d/init.d/pmproxy
-%attr(754,root,root) /etc/rc.d/init.d/pmwebd
 %{systemdunitdir}/pmcd.service
+%{systemdunitdir}/pmfind.service
+%{systemdunitdir}/pmfind.timer
+%{systemdunitdir}/pmie_check.service
+%{systemdunitdir}/pmie_check.timer
+%{systemdunitdir}/pmie_daily.service
+%{systemdunitdir}/pmie_daily.timer
 %{systemdunitdir}/pmie.service
+%{systemdunitdir}/pmlogger_check.service
+%{systemdunitdir}/pmlogger_check.timer
+%{systemdunitdir}/pmlogger_daily_report.service
+%{systemdunitdir}/pmlogger_daily_report.timer
+%{systemdunitdir}/pmlogger_daily.service
+%{systemdunitdir}/pmlogger_daily.timer
 %{systemdunitdir}/pmlogger.service
-%{systemdunitdir}/pmmgr.service
 %{systemdunitdir}/pmproxy.service
-%{systemdunitdir}/pmwebd.service
 %dir /var/lib/pcp/config
 %dir /var/lib/pcp/config/derived
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/derived/cpu-util.conf
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/derived/iostat.conf
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/derived/mssql.conf
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/derived/proc.conf
 %dir /var/lib/pcp/config/pmafm
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmafm/pcp
@@ -515,7 +556,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Web.*
 %attr(775,pcp,pcp) %dir /var/lib/pcp/config/pmda
 %dir /var/lib/pcp/config/pmie
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmie/crontab.docker
 %dir /var/lib/pcp/config/pmieconf
 %dir /var/lib/pcp/config/pmieconf/cisco
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmieconf/cisco/in_util
@@ -553,6 +593,8 @@ fi
 %dir /var/lib/pcp/config/pmieconf/shping
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmieconf/shping/response
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmieconf/shping/status
+%dir /var/lib/pcp/config/pmieconf/zeroconf
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmieconf/zeroconf/all_threads
 %dir /var/lib/pcp/config/pmlogconf
 %dir /var/lib/pcp/config/pmlogconf/apache
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/apache/processes
@@ -578,17 +620,12 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/bufcache-activity
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/bufcache-all
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/inode-cache
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/interrupts-irix
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/load
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/memory-irix
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/memory-linux
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/queues-irix
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/read-write-data
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/summary-linux
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/summary-windows
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/syscalls-irix
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/syscalls-linux
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/syscalls-percpu-irix
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kernel/vnodes
 %dir /var/lib/pcp/config/pmlogconf/kvm
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/kvm/kvm
@@ -607,13 +644,16 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/memory/swap-activity
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/memory/swap-all
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/memory/swap-config
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/memory/tlb-irix
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/memory/vmstat
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/memory/zoneinfo
 %dir /var/lib/pcp/config/pmlogconf/mmv
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/mmv/summary
 %dir /var/lib/pcp/config/pmlogconf/mysql
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/mysql/summary
+%dir /var/lib/pcp/config/pmlogconf/mssql
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/mssql/summary
+%dir /var/lib/pcp/config/pmlogconf/netcheck
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/netcheck/summary
 %dir /var/lib/pcp/config/pmlogconf/netfilter
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/netfilter/config
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/netfilter/summary
@@ -632,41 +672,29 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/nfs4-server
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/other-protocols
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/rpc
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/socket-irix
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/socket-linux
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/softnet
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/streams
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/tcp-activity-irix
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/tcp-activity-linux
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/tcp-all
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/udp6
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/udp-all
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/udp-packets-irix
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/udp-packets-linux
 %dir /var/lib/pcp/config/pmlogconf/nginx
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/nginx/summary
 %dir /var/lib/pcp/config/pmlogconf/oracle
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/oracle/summary
+%dir /var/lib/pcp/config/pmlogconf/openmetrics
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/openmetrics/summary
+%dir /var/lib/pcp/config/pmlogconf/openvswitch
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/openvswitch/summary
+%dir /var/lib/pcp/config/pmlogconf/postgresql
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/postgresql/summary
 %dir /var/lib/pcp/config/pmlogconf/platform
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/platform/hinv
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/platform/linux
-%dir /var/lib/pcp/config/pmlogconf/postgresql
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/postgresql/summary
-%dir /var/lib/pcp/config/pmlogconf/sgi
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/cpu-evctr
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/craylink
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/efs
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/hub
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/kaio
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/node-memory
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/numa
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/numa-summary
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/xbow
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/xlv-activity
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/xlv-stripe-io
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/xvm-all
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/xvm-ops
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sgi/xvm-stats
+%dir /var/lib/pcp/config/pmlogconf/rabbitmq
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/rabbitmq/summary
 %dir /var/lib/pcp/config/pmlogconf/shping
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/shping/summary
 %dir /var/lib/pcp/config/pmlogconf/sqlserver
@@ -676,15 +704,20 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/storage/vdo-summary
 %dir /var/lib/pcp/config/pmlogconf/tools
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/atop
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/atop-gpustats
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/atop-hotproc
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/atop-httpstats
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/atop-infiniband
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/atop-nfsclient
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/atop-perfevent
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/atop-proc
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/atop-summary
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/collectl
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/collectl-interrupts
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/collectl-summary
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/dmcache
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/dstat
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/dstat-summary
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/free
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/free-summary
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/hotproc
@@ -710,15 +743,9 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/vector-summary
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/vmstat
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/vmstat-summary
-%dir /var/lib/pcp/config/pmlogconf/v1.0
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/v1.0/C2
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/v1.0/C3
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/v1.0/D3
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/v1.0/K0
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/v1.0/S0
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/v1.0/S1
 %dir /var/lib/pcp/config/pmlogconf/zeroconf
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/zeroconf/atop-proc
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/zeroconf/interrupts
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/zeroconf/nfsclient
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/zeroconf/numastat
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/zeroconf/pidstat
@@ -727,12 +754,17 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/zeroconf/xfs-perdev
 %dir /var/lib/pcp/config/pmlogconf/zimbra
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/zimbra/all
+%dir /var/lib/pcp/config/pmlogconf/gfs2
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/gfs2/gfs2-all
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/gfs2/gfs2-base
+%dir /var/lib/pcp/config/pmlogconf/statsd
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/statsd/statsd
 %dir /var/lib/pcp/config/pmlogger
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogger/config.pmstat
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogger/crontab.docker
 %dir /var/lib/pcp/config/pmlogrewrite
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/cgroup_units.conf
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/jbd2_kernel_ulong.conf
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/linux_disk_all_fixups.conf
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/linux_kernel_fixups.conf
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/linux_kernel_ulong.conf
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/linux_proc_fs_nfsd_fixups.conf
@@ -748,20 +780,12 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/proc_kernel_ulong.conf
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/proc_kernel_ulong_migrate.conf
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/proc_scheduler.conf
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/rpm_migrate.conf
 %dir /var/lib/pcp/pmdas
 %dir /var/lib/pcp/pmdas/activemq
 %attr(755,root,root) /var/lib/pcp/pmdas/activemq/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/activemq/Remove
-/var/lib/pcp/pmdas/activemq/ActiveMQ.pm
-/var/lib/pcp/pmdas/activemq/Cache.pm
-/var/lib/pcp/pmdas/activemq/JVMGarbageCollection.pm
-/var/lib/pcp/pmdas/activemq/JVMMemory.pm
-/var/lib/pcp/pmdas/activemq/JVMMemoryPool.pm
 /var/lib/pcp/pmdas/activemq/pmdaactivemq.pl
-/var/lib/pcp/pmdas/activemq/Queue.pm
-/var/lib/pcp/pmdas/activemq/RESTClient.pm
-/var/lib/pcp/pmdas/activemq/TimeSource.pm
+/var/lib/pcp/pmdas/activemq/PCP
 %dir /var/lib/pcp/pmdas/apache
 %doc /var/lib/pcp/pmdas/apache/README
 %attr(755,root,root) /var/lib/pcp/pmdas/apache/Install
@@ -817,6 +841,7 @@ fi
 %dir /var/lib/pcp/pmdas/dm
 %attr(755,root,root) /var/lib/pcp/pmdas/dm/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/dm/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/dm/Upgrade
 %attr(755,root,root) /var/lib/pcp/pmdas/dm/pmda_dm.so
 %attr(755,root,root) /var/lib/pcp/pmdas/dm/pmdadm
 /var/lib/pcp/pmdas/dm/domain.h
@@ -846,7 +871,8 @@ fi
 %dir /var/lib/pcp/pmdas/elasticsearch
 %attr(755,root,root) /var/lib/pcp/pmdas/elasticsearch/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/elasticsearch/Remove
-%attr(755,root,root) /var/lib/pcp/pmdas/elasticsearch/pmdaelasticsearch.pl
+%attr(755,root,root) /var/lib/pcp/pmdas/elasticsearch/Upgrade
+%attr(755,root,root) /var/lib/pcp/pmdas/elasticsearch/pmdaelasticsearch.python
 %dir /var/lib/pcp/pmdas/gfs2
 %attr(755,root,root) /var/lib/pcp/pmdas/gfs2/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/gfs2/Remove
@@ -887,8 +913,16 @@ fi
 %dir /var/lib/pcp/pmdas/kvm
 %attr(755,root,root) /var/lib/pcp/pmdas/kvm/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/kvm/Remove
-%attr(755,root,root) /var/lib/pcp/pmdas/kvm/pmdakvm.pl
-/var/lib/pcp/pmdas/ib
+%attr(755,root,root) /var/lib/pcp/pmdas/kvm/Upgrade
+%attr(755,root,root) /var/lib/pcp/pmdas/kvm/pmda_kvm.so
+%attr(755,root,root) /var/lib/pcp/pmdas/kvm/pmdakvm
+/var/lib/pcp/pmdas/kvm/domain.h
+/var/lib/pcp/pmdas/kvm/help
+/var/lib/pcp/pmdas/kvm/help.dir
+/var/lib/pcp/pmdas/kvm/help.pag
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmdas/kvm/kvm.conf
+/var/lib/pcp/pmdas/kvm/root
+/var/lib/pcp/pmdas/kvm/root_kvm
 %dir /var/lib/pcp/pmdas/infiniband
 %attr(755,root,root) /var/lib/pcp/pmdas/infiniband/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/infiniband/Remove
@@ -907,8 +941,7 @@ fi
 %doc /var/lib/pcp/pmdas/lmsensors/README
 %attr(755,root,root) /var/lib/pcp/pmdas/lmsensors/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/lmsensors/Remove
-%attr(755,root,root) /var/lib/pcp/pmdas/lmsensors/pmdalmsensors
-/var/lib/pcp/pmdas/lmsensors/domain.h
+%attr(755,root,root) /var/lib/pcp/pmdas/lmsensors/pmdalmsensors.python
 /var/lib/pcp/pmdas/lmsensors/help
 /var/lib/pcp/pmdas/lmsensors/pmns
 /var/lib/pcp/pmdas/lmsensors/root
@@ -924,6 +957,7 @@ fi
 %dir /var/lib/pcp/pmdas/lustre
 %attr(755,root,root) /var/lib/pcp/pmdas/lustre/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/lustre/Remove
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmdas/lustre/lustre.conf
 /var/lib/pcp/pmdas/lustre/pmdalustre.pl
 %dir /var/lib/pcp/pmdas/lustrecomm
 %doc /var/lib/pcp/pmdas/lustrecomm/README
@@ -969,6 +1003,12 @@ fi
 /var/lib/pcp/pmdas/mounts/pmns
 /var/lib/pcp/pmdas/mounts/root
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmdas/mounts/mounts.conf
+%dir /var/lib/pcp/pmdas/mssql
+%attr(755,root,root) /var/lib/pcp/pmdas/mssql/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/mssql/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/mssql/Upgrade
+%attr(755,root,root) /var/lib/pcp/pmdas/mssql/pmdamssql.python
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmdas/mssql/mssql.conf
 %dir /var/lib/pcp/pmdas/mysql
 %attr(755,root,root) /var/lib/pcp/pmdas/mysql/README
 %attr(755,root,root) /var/lib/pcp/pmdas/mysql/Install
@@ -978,6 +1018,23 @@ fi
 %attr(755,root,root) /var/lib/pcp/pmdas/named/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/named/Remove
 %attr(755,root,root) /var/lib/pcp/pmdas/named/pmdanamed.pl
+%dir /var/lib/pcp/pmdas/netcheck
+%attr(755,root,root) /var/lib/pcp/pmdas/netcheck/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/netcheck/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/netcheck/pmdanetcheck.python
+%attr(755,root,root) /var/lib/pcp/pmdas/netcheck/pmdautil.python
+%attr(755,root,root) /var/lib/pcp/pmdas/netcheck/pyprep
+%dir /var/lib/pcp/pmdas/netcheck/modules
+/var/lib/pcp/pmdas/netcheck/modules/__init__.python
+/var/lib/pcp/pmdas/netcheck/modules/dns_lookup.python
+/var/lib/pcp/pmdas/netcheck/modules/dns_reverse.python
+/var/lib/pcp/pmdas/netcheck/modules/pcpnetcheck.python
+/var/lib/pcp/pmdas/netcheck/modules/ping.python
+/var/lib/pcp/pmdas/netcheck/modules/ping_latency.python
+/var/lib/pcp/pmdas/netcheck/modules/ping_loss.python
+/var/lib/pcp/pmdas/netcheck/modules/port_open.python
+/var/lib/pcp/pmdas/netcheck/modules/url_get.python
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmdas/netcheck/netcheck.conf
 %dir /var/lib/pcp/pmdas/netfilter
 %attr(755,root,root) /var/lib/pcp/pmdas/netfilter/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/netfilter/Remove
@@ -991,11 +1048,12 @@ fi
 %dir /var/lib/pcp/pmdas/nfsclient
 %attr(755,root,root) /var/lib/pcp/pmdas/nfsclient/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/nfsclient/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/nfsclient/Upgrade
 %attr(755,root,root) /var/lib/pcp/pmdas/nfsclient/pmdanfsclient.python
 %dir /var/lib/pcp/pmdas/nginx
 %attr(755,root,root) /var/lib/pcp/pmdas/nginx/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/nginx/Remove
-%config(noreplace) %verify(not md5 mtime size) %attr(755,root,root) /var/lib/pcp/pmdas/nginx/nginx.conf
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmdas/nginx/nginx.conf
 %attr(755,root,root) /var/lib/pcp/pmdas/nginx/pmdanginx.pl
 %dir /var/lib/pcp/pmdas/nvidia
 %attr(755,root,root) /var/lib/pcp/pmdas/nvidia/README
@@ -1007,6 +1065,16 @@ fi
 /var/lib/pcp/pmdas/nvidia/help
 /var/lib/pcp/pmdas/nvidia/pmns
 /var/lib/pcp/pmdas/nvidia/root
+%dir /var/lib/pcp/pmdas/openmetrics
+/var/lib/pcp/pmdas/openmetrics/config.d
+%attr(755,root,root) /var/lib/pcp/pmdas/openmetrics/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/openmetrics/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/openmetrics/Upgrade
+%attr(755,root,root) /var/lib/pcp/pmdas/openmetrics/pmdaopenmetrics.python
+%dir /var/lib/pcp/pmdas/openvswitch
+%attr(755,root,root) /var/lib/pcp/pmdas/openvswitch/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/openvswitch/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/openvswitch/pmdaopenvswitch.python
 %dir /var/lib/pcp/pmdas/oracle
 %attr(755,root,root) /var/lib/pcp/pmdas/oracle/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/oracle/Remove
@@ -1033,7 +1101,9 @@ fi
 %dir /var/lib/pcp/pmdas/postgresql
 %attr(755,root,root) /var/lib/pcp/pmdas/postgresql/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/postgresql/Remove
-%attr(755,root,root) /var/lib/pcp/pmdas/postgresql/pmdapostgresql.pl
+%attr(755,root,root) /var/lib/pcp/pmdas/postgresql/Upgrade
+%attr(755,root,root) /var/lib/pcp/pmdas/postgresql/pmdapostgresql.python
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmdas/postgresql/pmdapostgresql.conf
 %dir /var/lib/pcp/pmdas/proc
 %attr(755,root,root) /var/lib/pcp/pmdas/proc/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/proc/Remove
@@ -1046,11 +1116,11 @@ fi
 /var/lib/pcp/pmdas/proc/root
 /var/lib/pcp/pmdas/proc/root_proc
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmdas/proc/samplehotproc.conf
-%dir /var/lib/pcp/pmdas/prometheus
-%dir /var/lib/pcp/pmdas/prometheus/config.d
-%attr(755,root,root) /var/lib/pcp/pmdas/prometheus/Install
-%attr(755,root,root) /var/lib/pcp/pmdas/prometheus/Remove
-%attr(755,root,root) /var/lib/pcp/pmdas/prometheus/pmdaprometheus.python
+%dir /var/lib/pcp/pmdas/rabbitmq
+%attr(755,root,root) /var/lib/pcp/pmdas/rabbitmq/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/rabbitmq/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/rabbitmq/pmdarabbitmq.python
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmdas/rabbitmq/rabbitmq.conf
 %dir /var/lib/pcp/pmdas/redis
 %attr(755,root,root) /var/lib/pcp/pmdas/redis/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/redis/Remove
@@ -1073,15 +1143,6 @@ fi
 /var/lib/pcp/pmdas/root/help.pag
 /var/lib/pcp/pmdas/root/root
 /var/lib/pcp/pmdas/root/root_root
-%dir /var/lib/pcp/pmdas/rpm
-%attr(755,root,root) /var/lib/pcp/pmdas/rpm/Install
-%attr(755,root,root) /var/lib/pcp/pmdas/rpm/Remove
-%attr(755,root,root) /var/lib/pcp/pmdas/rpm/pmda_rpm.so
-%attr(755,root,root) /var/lib/pcp/pmdas/rpm/pmdarpm
-/var/lib/pcp/pmdas/rpm/domain.h
-/var/lib/pcp/pmdas/rpm/help
-/var/lib/pcp/pmdas/rpm/pmns
-/var/lib/pcp/pmdas/rpm/root
 %dir /var/lib/pcp/pmdas/rsyslog
 %attr(755,root,root) /var/lib/pcp/pmdas/rsyslog/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/rsyslog/Remove
@@ -1156,7 +1217,6 @@ fi
 %attr(755,root,root) /var/lib/pcp/pmdas/snmp/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/snmp/Remove
 %attr(755,root,root) /var/lib/pcp/pmdas/snmp/pmdasnmp.pl
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmdas/snmp/snmp.conf
 %dir /var/lib/pcp/pmdas/summary
 %doc /var/lib/pcp/pmdas/summary/README
 %attr(755,root,root) /var/lib/pcp/pmdas/summary/Install
@@ -1189,6 +1249,8 @@ fi
 %doc /var/lib/pcp/pmdas/trivial/README
 %attr(755,root,root) /var/lib/pcp/pmdas/trivial/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/trivial/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/trivial/pmdatrivial.perl
+%attr(755,root,root) /var/lib/pcp/pmdas/trivial/pmdatrivial.python
 /var/lib/pcp/pmdas/trivial/domain.h
 /var/lib/pcp/pmdas/trivial/help
 /var/lib/pcp/pmdas/trivial/pmns
@@ -1212,15 +1274,10 @@ fi
 %attr(755,root,root) /var/lib/pcp/pmdas/unbound/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/unbound/Remove
 %attr(755,root,root) /var/lib/pcp/pmdas/unbound/pmdaunbound.python
-%dir /var/lib/pcp/pmdas/vmware
-%attr(755,root,root) /var/lib/pcp/pmdas/vmware/Install
-%attr(755,root,root) /var/lib/pcp/pmdas/vmware/Remove
-%attr(755,root,root) /var/lib/pcp/pmdas/vmware/pmdavmware.pl
 %dir /var/lib/pcp/pmdas/weblog
 %doc /var/lib/pcp/pmdas/weblog/README
 %attr(755,root,root) /var/lib/pcp/pmdas/weblog/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/weblog/Remove
-%attr(755,root,root) /var/lib/pcp/pmdas/weblog/pmdaweblog
 %attr(755,root,root) /var/lib/pcp/pmdas/weblog/check_match
 %attr(755,root,root) /var/lib/pcp/pmdas/weblog/server.sh
 %attr(755,root,root) /var/lib/pcp/pmdas/weblog/weblogconv.sh
@@ -1257,23 +1314,25 @@ fi
 %attr(775,pcp,pcp) %dir /var/log/pcp/pmcd
 %attr(775,pcp,pcp) %dir /var/log/pcp/pmie
 %attr(775,pcp,pcp) %dir /var/log/pcp/pmlogger
-%attr(775,pcp,pcp) %dir /var/log/pcp/pmmgr
 %attr(775,pcp,pcp) %dir /var/log/pcp/pmproxy
-%attr(775,pcp,pcp) %dir /var/log/pcp/pmwebd
+%{_mandir}/man1/PCPCompat.1*
+%{_mandir}/man1/PCPIntro.1*
 %{_mandir}/man1/chkhelp.1*
 %{_mandir}/man1/collectl2pcp.1*
 %{_mandir}/man1/dbpmda.1*
 %{_mandir}/man1/dbprobe.1*
+%{_mandir}/man1/find-filter.1*
 %{_mandir}/man1/ganglia2pcp.1*
 %{_mandir}/man1/genpmda.1*
 %{_mandir}/man1/iostat2pcp.1*
 %{_mandir}/man1/mkaf.1*
 %{_mandir}/man1/mrtg2pcp.1*
 %{_mandir}/man1/pcp.1*
-%{_mandir}/man1/pcp2csv.1
+%{_mandir}/man1/pcp2elasticsearch.1*
 %{_mandir}/man1/pcp2graphite.1*
 %{_mandir}/man1/pcp2influxdb.1*
 %{_mandir}/man1/pcp2json.1*
+%{_mandir}/man1/pcp2spark.1*
 %{_mandir}/man1/pcp2xml.1*
 %{_mandir}/man1/pcp-atop.1*
 %{_mandir}/man1/pcp-atopsar.1*
@@ -1281,8 +1340,6 @@ fi
 %{_mandir}/man1/pcp-dmcache.1*
 %{_mandir}/man1/pcp-dstat.1*
 %{_mandir}/man1/pcp-free.1*
-%{_mandir}/man1/pcpintro.1
-%{_mandir}/man1/PCPIntro.1*
 %{_mandir}/man1/pcp-iostat.1*
 %{_mandir}/man1/pcp-ipcs.1*
 %{_mandir}/man1/pcp-kube-pods.1*
@@ -1303,7 +1360,6 @@ fi
 %{_mandir}/man1/pmcd_wait.1*
 %{_mandir}/man1/pmclient.1*
 %{_mandir}/man1/pmclient_fg.1
-%{_mandir}/man1/pmcollectl.1*
 %{_mandir}/man1/pmconfig.1*
 %{_mandir}/man1/pmdaactivemq.1*
 %{_mandir}/man1/pmdaapache.1*
@@ -1322,7 +1378,6 @@ fi
 %{_mandir}/man1/pmdagfs2.1*
 %{_mandir}/man1/pmdagluster.1*
 %{_mandir}/man1/pmdagpfs.1*
-%{_mandir}/man1/pmdagpsd.1*
 %{_mandir}/man1/pmdahaproxy.1*
 %{_mandir}/man1/pmdaib.1*
 %{_mandir}/man1/pmdajbd2.1*
@@ -1332,7 +1387,6 @@ fi
 %{_mandir}/man1/pmdalibvirt.1*
 %{_mandir}/man1/pmdalinux.1*
 %{_mandir}/man1/pmdalio.1*
-%{_mandir}/man1/pmdalmsensors.1*
 %{_mandir}/man1/pmdalogger.1*
 %{_mandir}/man1/pmdalustre.1*
 %{_mandir}/man1/pmdalustrecomm.1*
@@ -1341,36 +1395,33 @@ fi
 %{_mandir}/man1/pmdamic.1*
 %{_mandir}/man1/pmdammv.1*
 %{_mandir}/man1/pmdamounts.1*
+%{_mandir}/man1/pmdamssql.1*
 %{_mandir}/man1/pmdamysql.1*
-%{_mandir}/man1/pmdanamed.1*
+%{_mandir}/man1/pmdanetcheck.1*
 %{_mandir}/man1/pmdanetfilter.1*
-%{_mandir}/man1/pmdanews.1*
 %{_mandir}/man1/pmdanfsclient.1*
 %{_mandir}/man1/pmdanginx.1*
 %{_mandir}/man1/pmdanutcracker.1*
 %{_mandir}/man1/pmdanvidia.1*
+%{_mandir}/man1/pmdaopenmetrics.1*
+%{_mandir}/man1/pmdaopenvswitch.1*
 %{_mandir}/man1/pmdaoracle.1*
-%{_mandir}/man1/pmdapapi.1*
-%{_mandir}/man1/pmdapdns.1*
 %{_mandir}/man1/pmdaperfevent.1*
 %{_mandir}/man1/pmdapipe.1*
 %{_mandir}/man1/pmdapostfix.1*
 %{_mandir}/man1/pmdapostgresql.1*
 %{_mandir}/man1/pmdaproc.1*
-%{_mandir}/man1/pmdaprometheus.1*
+%{_mandir}/man1/pmdarabbitmq.1*
 %{_mandir}/man1/pmdaredis.1*
 %{_mandir}/man1/pmdaroomtemp.1*
 %{_mandir}/man1/pmdaroot.1*
-%{_mandir}/man1/pmdarpm.1*
 %{_mandir}/man1/pmdarsyslog.1*
-%{_mandir}/man1/pmdasamba.1*
 %{_mandir}/man1/pmdasample.1*
 %{_mandir}/man1/pmdasendmail.1*
 %{_mandir}/man1/pmdashping.1*
 %{_mandir}/man1/pmdasimple.1*
 %{_mandir}/man1/pmdaslurm.1*
 %{_mandir}/man1/pmdasmart.1*
-%{_mandir}/man1/pmdasnmp.1*
 %{_mandir}/man1/pmdasummary.1*
 %{_mandir}/man1/pmdasystemd.1*
 %{_mandir}/man1/pmdate.1*
@@ -1378,7 +1429,6 @@ fi
 %{_mandir}/man1/pmdatrivial.1*
 %{_mandir}/man1/pmdatxmon.1*
 %{_mandir}/man1/pmdaunbound.1*
-%{_mandir}/man1/pmdavmware.1*
 %{_mandir}/man1/pmdaweblog.1*
 %{_mandir}/man1/pmdaxfs.1*
 %{_mandir}/man1/pmdazimbra.1*
@@ -1389,6 +1439,7 @@ fi
 %{_mandir}/man1/pmerr.1*
 %{_mandir}/man1/pmevent.1*
 %{_mandir}/man1/pmfind.1*
+%{_mandir}/man1/pmfind_check.1*
 %{_mandir}/man1/pmgenmap.1*
 %{_mandir}/man1/pmgetopt.1*
 %{_mandir}/man1/pmhostname.1*
@@ -1410,14 +1461,13 @@ fi
 %{_mandir}/man1/pmlogger_daily.1*
 %{_mandir}/man1/pmlogger_daily_report.1*
 %{_mandir}/man1/pmlogger_merge.1*
+%{_mandir}/man1/pmlogger_rewrite.1*
 %{_mandir}/man1/pmloglabel.1*
 %{_mandir}/man1/pmlogmv.1*
 %{_mandir}/man1/pmlogreduce.1*
 %{_mandir}/man1/pmlogrewrite.1*
 %{_mandir}/man1/pmlogsize.1*
 %{_mandir}/man1/pmlogsummary.1*
-%{_mandir}/man1/pmmgr.1*
-%{_mandir}/man1/pmnewlog.1*
 %{_mandir}/man1/pmnsadd.1*
 %{_mandir}/man1/pmnsdel.1*
 %{_mandir}/man1/pmpause.1*
@@ -1426,6 +1476,7 @@ fi
 %{_mandir}/man1/pmproxy.1*
 %{_mandir}/man1/pmpython.1*
 %{_mandir}/man1/pmrep.1*
+%{_mandir}/man1/pmseries.1*
 %{_mandir}/man1/pmsignal.1*
 %{_mandir}/man1/pmsleep.1*
 %{_mandir}/man1/pmsocks.1*
@@ -1438,6 +1489,7 @@ fi
 %{_mandir}/man1/sheet2pcp.1*
 %{_mandir}/man1/telnet-probe.1*
 %{_mandir}/man5/LOGARCHIVE.5*
+%{_mandir}/man5/PMNS.5*
 %{_mandir}/man5/pcp-atoprc.5*
 %{_mandir}/man5/pcp-dstat.5*
 %{_mandir}/man5/perfevent.conf.5*
@@ -1514,23 +1566,39 @@ fi
 %dir %{_libexecdir}/pcp/bin
 %attr(755,root,root) %{_libexecdir}/pcp/bin/newhelp
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmcpp
+%attr(755,root,root) %{_libexecdir}/pcp/bin/pmlogger_rewrite
 %attr(755,root,root) %{_libexecdir}/pcp/bin/pmnsmerge
+%dir %{_libexecdir}/pcp/pmns
+%attr(755,root,root) %{_libexecdir}/pcp/pmns/Make.stdpmid
+%attr(755,root,root) %{_libexecdir}/pcp/pmns/Rebuild
+%{_libexecdir}/pcp/pmns/Makefile
+%{_libexecdir}/pcp/pmns/root_jbd2
+%{_libexecdir}/pcp/pmns/root_kvm
+%{_libexecdir}/pcp/pmns/root_linux
+%{_libexecdir}/pcp/pmns/root_mmv
+%{_libexecdir}/pcp/pmns/root_pmcd
+%{_libexecdir}/pcp/pmns/root_pmproxy
+%{_libexecdir}/pcp/pmns/root_proc
+%{_libexecdir}/pcp/pmns/root_xfs
+%{_libexecdir}/pcp/pmns/stdpmid.pcp
+%config(noreplace) %verify(not md5 mtime size) %{_libexecdir}/pcp/pmns/stdpmid.local
 %dir /var/lib/pcp
 %dir /var/lib/pcp/pmns
-%config(missingok) /var/lib/pcp/pmns/.NeedRebuild
 %attr(755,root,root) /var/lib/pcp/pmns/Make.stdpmid
 %attr(755,root,root) /var/lib/pcp/pmns/Rebuild
 /var/lib/pcp/pmns/Makefile
 /var/lib/pcp/pmns/root_jbd2
+/var/lib/pcp/pmns/root_kvm
 /var/lib/pcp/pmns/root_linux
 /var/lib/pcp/pmns/root_mmv
 /var/lib/pcp/pmns/root_pmcd
+/var/lib/pcp/pmns/root_pmproxy
 /var/lib/pcp/pmns/root_proc
 /var/lib/pcp/pmns/root_xfs
 /var/lib/pcp/pmns/stdpmid.pcp
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmns/stdpmid.local
 %ghost /var/lib/pcp/pmns/stdpmid
-%attr(775,pcp,pcp) %dir /var/run/pcp
+%attr(775,pcp,pcp) %dir /run/pcp
 %{systemdtmpfilesdir}/pcp.conf
 %{_mandir}/man1/newhelp.1*
 %{_mandir}/man1/pmcpp.1*
@@ -1540,7 +1608,6 @@ fi
 %{_mandir}/man5/pcp.conf.5*
 %{_mandir}/man5/pcp.env.5*
 %{_mandir}/man5/pmieconf.5*
-%{_mandir}/man5/pmns.5*
 
 %files devel
 %defattr(644,root,root,755)
@@ -1552,10 +1619,8 @@ fi
 %attr(755,root,root) %{_libdir}/libpcp_trace.so
 %attr(755,root,root) %{_libdir}/libpcp_web.so
 %{_includedir}/pcp
-%{_mandir}/man3/logimport.3
 %{_mandir}/man3/LOGIMPORT.3*
 %{_mandir}/man3/mmv_*.3*
-%{_mandir}/man3/pcpintro.3
 %{_mandir}/man3/PCPIntro.3*
 %{_mandir}/man3/__pm*.3*
 %{_mandir}/man3/pm*.3*