X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=pcp.spec;h=b298a51f0c36be7940e99cf7c3589c0e113dc53f;hb=ae9bf6c;hp=6c1925346c24c35eeea27485464d32758ef27ebe;hpb=30d8dac26504222687758230272e8b51d732b90b;p=packages%2Fpcp.git

diff --git a/pcp.spec b/pcp.spec
index 6c19253..b298a51 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,33 +1,71 @@
 # TODO:
-# - pcp user/group, log dirs (see Debian packaging)
 # - PLDify init scripts
-# - /var/lib/pcp looks like mess, configs/variable data/scripts/ELFs (maybe consult Debian packaging?)
+# - 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
 #
+# Conditional build:
+%bcond_without	qt		# Qt 4.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:	3.7.1
-Release:	1
+Version:	3.10.0
+Release:	16
 License:	LGPL v2.1 (libraries), GPL v2 (the rest)
 Group:		Applications/System
 Source0:	ftp://oss.sgi.com/projects/pcp/download/%{name}-%{version}.src.tar.gz
-# Source0-md5:	7131aa83ecd9ab3a409ffacd41a3b43a
+# Source0-md5:	483b20d7245fc0a3ef895a965f2b59c2
 Patch0:		%{name}-ps.patch
 Patch1:		%{name}-opt.patch
+Patch2:		%{name}-nspr.patch
+Patch3:		%{name}-saslconfdir.patch
+Patch4:		%{name}-rpm.patch
+Patch5:		python-install.patch
+Patch6:		systemd.patch
 URL:		http://oss.sgi.com/projects/pcp/
 BuildRequires:	autoconf >= 2.60
+BuildRequires:	avahi-devel
 BuildRequires:	bison
+BuildRequires:	cyrus-sasl-devel >= 2
 BuildRequires:	flex
+%ifarch i386
+BuildRequires:	libatomic-devel
+%endif
+BuildRequires:	libibmad-devel
+BuildRequires:	libibumad-devel
+BuildRequires:	libmicrohttpd-devel >= 0.9.10
+BuildRequires:	nspr-devel >= 4
+BuildRequires:	nss-devel >= 3
+BuildRequires:	openssl-devel
 BuildRequires:	perl-ExtUtils-MakeMaker
 BuildRequires:	perl-base
 BuildRequires:	perl-tools-pod
-BuildRequires:	python-devel
+BuildRequires:	pkgconfig
+BuildRequires:	python-devel >= 2.0
+BuildRequires:	python3-devel >= 1:3.2
 BuildRequires:	readline-devel
+BuildRequires:	rpm-devel >= 5
 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
+%endif
 Requires:	%{name}-libs = %{version}-%{release}
+Requires:	libmicrohttpd >= 0.9.10
+Requires:	perl-pcp = %{version}-%{release}
+Requires:	python-pcp = %{version}-%{release}
+Suggests:	crondaemon
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,17 +77,51 @@ the interesting performance data in a system, and allows client
 applications to easily retrieve and process any subset of that data.
 
 %description -l pl.UTF-8
-PCP (Performance Co-Pilot) to szkielet i usługi mające na celu
-obsługę monitorowania wydajności i zarządzania wydajnością.
+PCP (Performance Co-Pilot) to szkielet i usługi mające na celu obsługę
+monitorowania wydajności i zarządzania wydajnością.
 
 PCP udostępnia ujednoliconą abstrakcję dla wszystkich interesujących
 danych związanych z wydajnością w systemie i pozwala aplikacjom
 klienckim łatwo odczytywać i przetwarzać dowolny podzbiór tych danych.
 
+%package gui
+Summary:	Performance Co-Pilot GUI tools
+Summary(pl.UTF-8):	Performance Co-Pilot - narzędzia GUI
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+
+%description gui
+pmchart is designed to produce stripcharts from Performance Co-Pilot
+(PCP) performance metrics fetched from live sources (one or more pmcd
+hosts) and also historical sources (one or more PCP archives).
+
+pmtime is a graphical time controller utility that coordinates time
+updates and VCR-like playback for other utilities like pmchart and
+pmval.
+
+%description gui -l pl.UTF-8
+pmchart służy do tworzenia wykresów z danych o wydajności pakietu PCP
+(Performance Co-Pilot) pobranych z żywych źródeł (jednego lub większej
+liczby hostów pmcd) oraz źródeł historycznych (jednego lub większej
+liczby archiwów PCP).
+
+pmtime to graficzne narzędzie do kontroli czasu, koordynujące
+aktualizację czasu oraz odtwarzanie w stylu VCR dla innych narzędzi,
+takich jak pmchart czy pmval.
+
 %package libs
 Summary:	PCP libraries
 Summary(pl.UTF-8):	Biblioteki PCP
 Group:		Libraries
+Requires(post,postun):	/sbin/ldconfig
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Provides:	group(pcp)
+Provides:	user(pcp)
 
 %description libs
 PCP libraries.
@@ -94,22 +166,37 @@ Perl interface to PCP libraries.
 Perlowy interfejs do bibliotek PCP.
 
 %package -n python-pcp
-Summary:	Python interface to PCP libraries
-Summary(pl.UTF-8):	Pythonowy interfejs do bibliotek PCP
+Summary:	Python 2 interface to PCP libraries
+Summary(pl.UTF-8):	Interfejs Pythona 2 do bibliotek PCP
 Group:		Development/Languages/Python
 Requires:	%{name}-libs = %{version}-%{release}
 
 %description -n python-pcp
-Python interface to PCP libraries.
+Python 2 interface to PCP libraries.
 
 %description -n python-pcp -l pl.UTF-8
-Pythonowy interfejs do bibliotek PCP.
+Interfejs Pythona 2 do bibliotek PCP.
+
+%package -n python3-pcp
+Summary:	Python 3 interface to PCP libraries
+Summary(pl.UTF-8):	Interfejs Pythona 3 do bibliotek PCP
+Group:		Development/Languages/Python
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description -n python3-pcp
+Python 3 interface to PCP libraries.
+
+%description -n python3-pcp -l pl.UTF-8
+Interfejs Pythona 3 do bibliotek PCP.
 
 %package -n bash-completion-pcp
 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.
@@ -117,14 +204,34 @@ bash-completion for PCP utilities.
 %description -n bash-completion-pcp -l pl.UTF-8
 Bashowe uzupełnianie nazw dla narzędzi PCP.
 
+%package -n systemtap-pcp
+Summary:	systemtap/dtrace probes for PCP
+Summary(pl.UTF-8):	Sondy systemtap/dtrace dla PCP
+Group:		Development/Tools
+Requires:	%{name} = %{version}-%{release}
+Requires:	systemtap-client
+
+%description -n systemtap-pcp
+systemtap/dtrace probes for PCP.
+
+%description -n systemtap-pcp -l pl.UTF-8
+Sondy systemtap/dtrace dla PCP.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 %{__autoconf}
 %configure \
+	%{!?with_qt:--without-qt} \
+	--with-python_prefix=%{_prefix} \
 	--with-rcdir=/etc/rc.d/init.d
 # ensure not *zipping man pages on install
 %{__sed} -i -e '/^HAVE_.*ED_MANPAGES/s,true,false,' src/include/builddefs
@@ -145,49 +252,82 @@ 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 -
+EOF
+
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_postclean
 
+# kill man pages specific to other OSs (note: pmdaaix.1 is installed as actual man source)
+%{__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
 # could be eventually packaged in examplesdir / docdir resp.
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/pcp/{demos,examples}
-# tests
+# 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
+%{__mv} $RPM_BUILD_ROOT%{_docdir}/pcp-doc/html html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre libs
+%groupadd -g 308 pcp
+%useradd -u 308 -d /var/lib/pcp -g pcp -s /bin/false -c "Performance Co-Pilot user" pcp
+
 %post	libs
 /sbin/ldconfig
 cd /var/lib/pcp/pmns
 umask 022
 PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 
-%postun	libs -p /sbin/ldconfig
+%postun	libs
+/sbin/ldconfig
+if [ "$1" = "0" ]; then
+	%userremove pcp
+	%groupremove pcp
+fi
 
 %files
 %defattr(644,root,root,755)
 %doc CHANGELOG README
+%attr(755,root,root) %{_bindir}/collectl2pcp
 %attr(755,root,root) %{_bindir}/dbpmda
 %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}/pmafm
+%attr(755,root,root) %{_bindir}/pmatop
 %attr(755,root,root) %{_bindir}/pmclient
 %attr(755,root,root) %{_bindir}/pmcollectl
-%attr(755,root,root) %{_bindir}/pmconfig
 %attr(755,root,root) %{_bindir}/pmdate
 %attr(755,root,root) %{_bindir}/pmdbg
+%attr(755,root,root) %{_bindir}/pmdiff
 %attr(755,root,root) %{_bindir}/pmdumplog
 %attr(755,root,root) %{_bindir}/pmerr
 %attr(755,root,root) %{_bindir}/pmevent
+%attr(755,root,root) %{_bindir}/pmfind
 %attr(755,root,root) %{_bindir}/pmgenmap
 %attr(755,root,root) %{_bindir}/pmie
 %attr(755,root,root) %{_bindir}/pmie2col
 %attr(755,root,root) %{_bindir}/pmieconf
+%attr(755,root,root) %{_bindir}/pmiostat
 %attr(755,root,root) %{_bindir}/pmlc
 %attr(755,root,root) %{_bindir}/pmlogcheck
+%attr(755,root,root) %{_bindir}/pmlogextract
+%attr(755,root,root) %{_bindir}/pmlogger
 %attr(755,root,root) %{_bindir}/pmloglabel
+%attr(755,root,root) %{_bindir}/pmlogmv
 %attr(755,root,root) %{_bindir}/pmlogsummary
 %attr(755,root,root) %{_bindir}/pmprobe
 %attr(755,root,root) %{_bindir}/pmsocks
@@ -201,8 +341,14 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %attr(755,root,root) %{_libdir}/pcp/bin/chkhelp
 %attr(755,root,root) %{_libdir}/pcp/bin/install-sh
 %attr(755,root,root) %{_libdir}/pcp/bin/mkaf
+%attr(755,root,root) %{_libdir}/pcp/bin/pcp-dmcache
+%attr(755,root,root) %{_libdir}/pcp/bin/pcp-free
+%attr(755,root,root) %{_libdir}/pcp/bin/pcp-numastat
+%attr(755,root,root) %{_libdir}/pcp/bin/pcp-uptime
 %attr(755,root,root) %{_libdir}/pcp/bin/pmcd
 %attr(755,root,root) %{_libdir}/pcp/bin/pmcd_wait
+%attr(755,root,root) %{_libdir}/pcp/bin/pmconfig
+%attr(755,root,root) %{_libdir}/pcp/bin/pmgetopt
 %attr(755,root,root) %{_libdir}/pcp/bin/pmhostname
 %attr(755,root,root) %{_libdir}/pcp/bin/pmie_check
 %attr(755,root,root) %{_libdir}/pcp/bin/pmie_daily
@@ -218,6 +364,7 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %attr(755,root,root) %{_libdir}/pcp/bin/pmlogger_merge
 %attr(755,root,root) %{_libdir}/pcp/bin/pmlogreduce
 %attr(755,root,root) %{_libdir}/pcp/bin/pmlogrewrite
+%attr(755,root,root) %{_libdir}/pcp/bin/pmmgr
 %attr(755,root,root) %{_libdir}/pcp/bin/pmnewlog
 %attr(755,root,root) %{_libdir}/pcp/bin/pmnsadd
 %attr(755,root,root) %{_libdir}/pcp/bin/pmnsdel
@@ -225,6 +372,7 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %attr(755,root,root) %{_libdir}/pcp/bin/pmproxy
 %attr(755,root,root) %{_libdir}/pcp/bin/pmsignal
 %attr(755,root,root) %{_libdir}/pcp/bin/pmsleep
+%attr(755,root,root) %{_libdir}/pcp/bin/pmwebd
 %attr(755,root,root) %{_libdir}/pcp/bin/pmwtf
 %attr(755,root,root) %{_libdir}/pcp/bin/telnet-probe
 %dir %{_datadir}/pcp
@@ -236,42 +384,63 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %{_datadir}/pcp/lib/pmdaproc.sh
 %{_datadir}/pcp/lib/rc-proc.sh
 %{_datadir}/pcp/lib/rc-proc.sh.minimal
+%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/sasl/pmcd.conf
 %{_sysconfdir}/pcp.sh
 %dir %{_sysconfdir}/pcp
 %dir %{_sysconfdir}/pcp/pmcd
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmcd/pmcd.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmcd/pmcd.options
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmcd/rc.local
-%dir %{_sysconfdir}/pcp/pmie
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmie/config.default
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmie/control
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmie/crontab
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmie/stomp
-%dir %{_sysconfdir}/pcp/pmie/cisco
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmie/cisco/in_util
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmie/cisco/out_util
-%{_sysconfdir}/pcp/pmlogger/Makefile
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmlogger/config.*
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmlogger/control
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmlogger/crontab
+%attr(775,root,pcp) %dir %{_sysconfdir}/pcp/pmie
+%attr(664,pcp,pcp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmie/control
+%attr(775,root,pcp) %dir %{_sysconfdir}/pcp/pmlogger
+%attr(664,pcp,pcp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmlogger/control
+%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,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.options
+%dir %{_sysconfdir}/pcp/pmwebd
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmwebd/pmwebd.options
 %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}/pmie.service
+%{systemdunitdir}/pmlogger.service
+%{systemdunitdir}/pmmgr.service
+%{systemdunitdir}/pmproxy.service
+%{systemdunitdir}/pmwebd.service
 %dir /var/lib/pcp/config
 %dir /var/lib/pcp/config/pmafm
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmafm/pcp
 %dir /var/lib/pcp/config/pmchart
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Apache
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Cisco
+#%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/MemAvailable
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Sendmail
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Sample
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Web.*
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/shping.*
+%attr(775,pcp,pcp) %dir /var/lib/pcp/config/pmda
 %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
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmieconf/cisco/out_util
 %dir /var/lib/pcp/config/pmieconf/cpu
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmieconf/cpu/context_switch
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmieconf/cpu/load_average
@@ -309,6 +478,7 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %dir /var/lib/pcp/config/pmlogconf/disk
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/disk/percontroller
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/disk/perdisk
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/disk/perpartition
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/disk/summary
 %dir /var/lib/pcp/config/pmlogconf/filesystem
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/filesystem/all
@@ -335,6 +505,7 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %dir /var/lib/pcp/config/pmlogconf/mailq
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/mailq/summary
 %dir /var/lib/pcp/config/pmlogconf/memory
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/memory/proc-linux
 %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
@@ -353,6 +524,8 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/nfs2-server
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/nfs3-client
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/nfs3-server
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/networking/nfs4-client
+%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
@@ -388,6 +561,29 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/shping/summary
 %dir /var/lib/pcp/config/pmlogconf/sqlserver
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sqlserver/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-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-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/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/iostat
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/ip
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/mpstat
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/numastat
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/pcp-summary
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/pmclient
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/pmclient-summary
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/pmieconf
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/pmstat
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/sar
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/sar-summary
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/uptime
+%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
@@ -398,8 +594,13 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %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/pmlogger
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogger/config.pmstat
 %dir /var/lib/pcp/config/pmlogrewrite
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/linux_proc_migrate.conf
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/linux_proc_net_snmp_migrate.conf
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/linux_xfs_migrate.conf
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/mysql_migrate.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/apache
 %doc /var/lib/pcp/pmdas/apache/README
@@ -438,6 +639,18 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %attr(755,root,root) /var/lib/pcp/pmdas/dbping/Remove
 %attr(755,root,root) /var/lib/pcp/pmdas/dbping/dbprobe.pl
 %attr(755,root,root) /var/lib/pcp/pmdas/dbping/pmdadbping.pl
+%dir /var/lib/pcp/pmdas/dmcache
+%attr(755,root,root) /var/lib/pcp/pmdas/dmcache/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/dmcache/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/dmcache/pmdadmcache.python
+%dir /var/lib/pcp/pmdas/ds389
+%attr(755,root,root) /var/lib/pcp/pmdas/ds389/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/ds389/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/ds389/pmdads389.pl
+%dir /var/lib/pcp/pmdas/ds389log
+%attr(755,root,root) /var/lib/pcp/pmdas/ds389log/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/ds389log/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/ds389log/pmdads389log.pl
 %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
@@ -450,14 +663,38 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 /var/lib/pcp/pmdas/gfs2/help
 /var/lib/pcp/pmdas/gfs2/pmns
 /var/lib/pcp/pmdas/gfs2/root
+%dir /var/lib/pcp/pmdas/gluster
+%attr(755,root,root) /var/lib/pcp/pmdas/gluster/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/gluster/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/gluster/pmdagluster.python
 %dir /var/lib/pcp/pmdas/gpsd
 %attr(755,root,root) /var/lib/pcp/pmdas/gpsd/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/gpsd/Remove
 %attr(755,root,root) /var/lib/pcp/pmdas/gpsd/pmdagpsd.pl
+%dir /var/lib/pcp/pmdas/jbd2
+%attr(755,root,root) /var/lib/pcp/pmdas/jbd2/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/jbd2/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/jbd2/pmdajbd2
+%attr(755,root,root) /var/lib/pcp/pmdas/jbd2/pmda_jbd2.so
+/var/lib/pcp/pmdas/jbd2/domain.h
+/var/lib/pcp/pmdas/jbd2/help
+/var/lib/pcp/pmdas/jbd2/help.dir
+/var/lib/pcp/pmdas/jbd2/help.pag
+/var/lib/pcp/pmdas/jbd2/root
+/var/lib/pcp/pmdas/jbd2/root_jbd2
 %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
+%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
+%attr(755,root,root) /var/lib/pcp/pmdas/infiniband/pmdaib
+/var/lib/pcp/pmdas/infiniband/domain.h
+/var/lib/pcp/pmdas/infiniband/help
+/var/lib/pcp/pmdas/infiniband/pmns
+/var/lib/pcp/pmdas/infiniband/root
 %dir /var/lib/pcp/pmdas/linux
 %attr(755,root,root) /var/lib/pcp/pmdas/linux/pmdalinux
 %attr(755,root,root) /var/lib/pcp/pmdas/linux/pmda_linux.so
@@ -522,6 +759,7 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 /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/mysql
+%attr(755,root,root) /var/lib/pcp/pmdas/mysql/README
 %attr(755,root,root) /var/lib/pcp/pmdas/mysql/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/mysql/Remove
 %attr(755,root,root) /var/lib/pcp/pmdas/mysql/pmdamysql.pl
@@ -539,6 +777,25 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %attr(755,root,root) /var/lib/pcp/pmdas/news/Remove
 %attr(755,root,root) /var/lib/pcp/pmdas/news/pmdanews.pl
 /var/lib/pcp/pmdas/news/active
+%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/pmdanfsclient.pl
+%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
+%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
+%attr(755,root,root) /var/lib/pcp/pmdas/nvidia/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/nvidia/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/nvidia/pmda_nvidia.so
+%attr(755,root,root) /var/lib/pcp/pmdas/nvidia/pmdanvidia
+/var/lib/pcp/pmdas/nvidia/domain.h
+/var/lib/pcp/pmdas/nvidia/help
+/var/lib/pcp/pmdas/nvidia/pmns
+/var/lib/pcp/pmdas/nvidia/root
 %dir /var/lib/pcp/pmdas/pdns
 %attr(755,root,root) /var/lib/pcp/pmdas/pdns/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/pdns/Remove
@@ -557,23 +814,14 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %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
+/var/lib/pcp/pmdas/proc/help.dir
+/var/lib/pcp/pmdas/proc/help.pag
 %attr(755,root,root) /var/lib/pcp/pmdas/proc/pmdaproc
 %attr(755,root,root) /var/lib/pcp/pmdas/proc/pmda_proc.so
 /var/lib/pcp/pmdas/proc/domain.h
 /var/lib/pcp/pmdas/proc/help
-/var/lib/pcp/pmdas/proc/pmns
-/var/lib/pcp/pmdas/proc/pmns.cgroup
 /var/lib/pcp/pmdas/proc/root
-%dir /var/lib/pcp/pmdas/process
-%doc /var/lib/pcp/pmdas/process/README
-%attr(755,root,root) /var/lib/pcp/pmdas/process/Install
-%attr(755,root,root) /var/lib/pcp/pmdas/process/Remove
-%attr(755,root,root) /var/lib/pcp/pmdas/process/pmdaprocess
-/var/lib/pcp/pmdas/process/domain.h
-/var/lib/pcp/pmdas/process/help
-/var/lib/pcp/pmdas/process/pmns
-/var/lib/pcp/pmdas/process/root
-%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmdas/process/process.conf
+/var/lib/pcp/pmdas/proc/root_proc
 %dir /var/lib/pcp/pmdas/roomtemp
 %doc /var/lib/pcp/pmdas/roomtemp/README
 %attr(755,root,root) /var/lib/pcp/pmdas/roomtemp/Install
@@ -583,6 +831,15 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 /var/lib/pcp/pmdas/roomtemp/help
 /var/lib/pcp/pmdas/roomtemp/pmns
 /var/lib/pcp/pmdas/roomtemp/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
@@ -595,9 +852,12 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %doc /var/lib/pcp/pmdas/sample/README
 %attr(755,root,root) /var/lib/pcp/pmdas/sample/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/sample/Remove
-%attr(755,root,root) /var/lib/pcp/pmdas/sample/pmdasample
-%attr(755,root,root) /var/lib/pcp/pmdas/sample/pmda_sample.so
+/var/lib/pcp/pmdas/sample/Makefile
 /var/lib/pcp/pmdas/sample/domain.h
+/var/lib/pcp/pmdas/sample/events.[ch]
+/var/lib/pcp/pmdas/sample/percontext.[ch]
+/var/lib/pcp/pmdas/sample/pmda.c
+/var/lib/pcp/pmdas/sample/sample.c
 /var/lib/pcp/pmdas/sample/help
 /var/lib/pcp/pmdas/sample/pmns
 /var/lib/pcp/pmdas/sample/root
@@ -625,7 +885,8 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %doc /var/lib/pcp/pmdas/simple/README
 %attr(755,root,root) /var/lib/pcp/pmdas/simple/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/simple/Remove
-%attr(755,root,root) /var/lib/pcp/pmdas/simple/pmdasimple.pl
+%attr(755,root,root) /var/lib/pcp/pmdas/simple/pmdasimple.perl
+%attr(755,root,root) /var/lib/pcp/pmdas/simple/pmdasimple.python
 /var/lib/pcp/pmdas/simple/domain.h
 /var/lib/pcp/pmdas/simple/help
 /var/lib/pcp/pmdas/simple/pmns
@@ -653,17 +914,17 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %attr(755,root,root) /var/lib/pcp/pmdas/systemd/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/systemd/Remove
 %attr(755,root,root) /var/lib/pcp/pmdas/systemd/pmdasystemd
-%attr(755,root,root) /var/lib/pcp/pmdas/systemd/pmda_systemd.so
 /var/lib/pcp/pmdas/systemd/domain.h
 /var/lib/pcp/pmdas/systemd/help
 /var/lib/pcp/pmdas/systemd/pmns
 /var/lib/pcp/pmdas/systemd/root
-/var/lib/pcp/pmdas/summary/expr.pmie
+%if %{with systemtap}
 %dir /var/lib/pcp/pmdas/systemtap
 %attr(755,root,root) /var/lib/pcp/pmdas/systemtap/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/systemtap/Remove
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmdas/systemtap/pmdasystemtap.pl
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmdas/systemtap/probes.stp
+%endif
 %dir /var/lib/pcp/pmdas/trace
 %doc /var/lib/pcp/pmdas/trace/README
 %attr(755,root,root) /var/lib/pcp/pmdas/trace/Install
@@ -687,9 +948,7 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %doc /var/lib/pcp/pmdas/txmon/README
 %attr(755,root,root) /var/lib/pcp/pmdas/txmon/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/txmon/Remove
-%attr(755,root,root) /var/lib/pcp/pmdas/txmon/pmdatxmon
 %attr(755,root,root) /var/lib/pcp/pmdas/txmon/genload
-%attr(755,root,root) /var/lib/pcp/pmdas/txmon/txrecord
 /var/lib/pcp/pmdas/txmon/domain.h
 /var/lib/pcp/pmdas/txmon/help
 /var/lib/pcp/pmdas/txmon/pmns
@@ -714,14 +973,40 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 /var/lib/pcp/pmdas/weblog/help
 /var/lib/pcp/pmdas/weblog/pmns
 /var/lib/pcp/pmdas/weblog/root
+%dir /var/lib/pcp/pmdas/xfs
+%attr(755,root,root) /var/lib/pcp/pmdas/xfs/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/xfs/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/xfs/pmda_xfs.so
+%attr(755,root,root) /var/lib/pcp/pmdas/xfs/pmdaxfs
+/var/lib/pcp/pmdas/xfs/domain.h
+/var/lib/pcp/pmdas/xfs/help
+/var/lib/pcp/pmdas/xfs/help.dir
+/var/lib/pcp/pmdas/xfs/help.pag
+/var/lib/pcp/pmdas/xfs/root
+/var/lib/pcp/pmdas/xfs/root_xfs
 %dir /var/lib/pcp/pmdas/zimbra
 %attr(755,root,root) /var/lib/pcp/pmdas/zimbra/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/zimbra/Remove
 %attr(755,root,root) /var/lib/pcp/pmdas/zimbra/pmdazimbra.pl
 %attr(755,root,root) /var/lib/pcp/pmdas/zimbra/zimbraprobe
+%dir /var/lib/pcp/pmdas/zswap
+%attr(755,root,root) /var/lib/pcp/pmdas/zswap/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/zswap/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/zswap/pmdazswap.python
+%attr(775,pcp,pcp) %dir /var/lib/pcp/tmp
+%attr(775,pcp,pcp) %dir /var/lib/pcp/tmp/pmie
+%attr(775,pcp,pcp) %dir /var/lib/pcp/tmp/pmlogger
+%attr(775,pcp,pcp) %dir /var/log/pcp
+%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/PCPIntro.1*
 %{_mandir}/man1/autofsd-probe.1*
 %{_mandir}/man1/chkhelp.1*
+%{_mandir}/man1/collectl2pcp.1*
 %{_mandir}/man1/dbpmda.1*
 %{_mandir}/man1/dbprobe.1*
 %{_mandir}/man1/genpmda.1*
@@ -729,28 +1014,54 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %{_mandir}/man1/mkaf.1*
 %{_mandir}/man1/mrtg2pcp.1*
 %{_mandir}/man1/pcp.1*
+%{_mandir}/man1/pcp-dmcache.1*
+%{_mandir}/man1/pcp-free.1*
+%{_mandir}/man1/pcp-numastat.1*
+%{_mandir}/man1/pcp-uptime.1*
 %{_mandir}/man1/pmafm.1*
+%{_mandir}/man1/pmatop.1*
 %{_mandir}/man1/pmcd.1*
 %{_mandir}/man1/pmcd_wait.1*
 %{_mandir}/man1/pmclient.1*
 %{_mandir}/man1/pmcollectl.1*
 %{_mandir}/man1/pmconfig.1*
+%{_mandir}/man1/pmdaapache.1*
 %{_mandir}/man1/pmdabash.1*
 %{_mandir}/man1/pmdabonding.1*
 %{_mandir}/man1/pmdacisco.1*
 %{_mandir}/man1/pmdadbping.1*
+%{_mandir}/man1/pmdadmcache.1*
+%{_mandir}/man1/pmdads389.1*
+%{_mandir}/man1/pmdads389log.1*
 %{_mandir}/man1/pmdaelasticsearch.1*
+%{_mandir}/man1/pmdagfs2.1*
+%{_mandir}/man1/pmdagluster.1*
 %{_mandir}/man1/pmdagpsd.1*
+%{_mandir}/man1/pmdaib.1*
+%{_mandir}/man1/pmdajbd2.1*
+%{_mandir}/man1/pmdakernel.1*
 %{_mandir}/man1/pmdakvm.1*
+%{_mandir}/man1/pmdalinux.1*
+%{_mandir}/man1/pmdalmsensors.1*
+%{_mandir}/man1/pmdalogger.1*
+%{_mandir}/man1/pmdalustrecomm.1*
 %{_mandir}/man1/pmdamailq.1*
 %{_mandir}/man1/pmdamemcache.1*
+%{_mandir}/man1/pmdammv.1*
+%{_mandir}/man1/pmdamounts.1*
 %{_mandir}/man1/pmdamysql.1*
 %{_mandir}/man1/pmdanamed.1*
 %{_mandir}/man1/pmdanetfilter.1*
 %{_mandir}/man1/pmdanews.1*
+%{_mandir}/man1/pmdanfsclient.1*
+%{_mandir}/man1/pmdanginx.1*
+%{_mandir}/man1/pmdanvidia.1*
 %{_mandir}/man1/pmdapdns.1*
 %{_mandir}/man1/pmdapostfix.1*
 %{_mandir}/man1/pmdapostgresql.1*
+%{_mandir}/man1/pmdaproc.1*
+%{_mandir}/man1/pmdaroomtemp.1*
+%{_mandir}/man1/pmdarpm.1*
 %{_mandir}/man1/pmdarsyslog.1*
 %{_mandir}/man1/pmdasamba.1*
 %{_mandir}/man1/pmdasample.1*
@@ -759,19 +1070,27 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %{_mandir}/man1/pmdasimple.1*
 %{_mandir}/man1/pmdasnmp.1*
 %{_mandir}/man1/pmdasummary.1*
+%{_mandir}/man1/pmdasystemd.1*
+%if %{with systemtap}
 %{_mandir}/man1/pmdasystemtap.1*
+%endif
 %{_mandir}/man1/pmdate.1*
 %{_mandir}/man1/pmdatrace.1*
 %{_mandir}/man1/pmdatrivial.1*
 %{_mandir}/man1/pmdatxmon.1*
 %{_mandir}/man1/pmdavmware.1*
 %{_mandir}/man1/pmdaweblog.1*
+%{_mandir}/man1/pmdaxfs.1*
+%{_mandir}/man1/pmdazswap.1*
 %{_mandir}/man1/pmdazimbra.1*
 %{_mandir}/man1/pmdbg.1*
+%{_mandir}/man1/pmdiff.1*
 %{_mandir}/man1/pmdumplog.1*
 %{_mandir}/man1/pmerr.1*
 %{_mandir}/man1/pmevent.1*
+%{_mandir}/man1/pmfind.1*
 %{_mandir}/man1/pmgenmap.1*
+%{_mandir}/man1/pmgetopt.1*
 %{_mandir}/man1/pmhostname.1*
 %{_mandir}/man1/pmie.1*
 %{_mandir}/man1/pmie2col.1*
@@ -779,6 +1098,7 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %{_mandir}/man1/pmie_daily.1*
 %{_mandir}/man1/pmieconf.1*
 %{_mandir}/man1/pmiestatus.1*
+%{_mandir}/man1/pmiostat.1*
 %{_mandir}/man1/pmlc.1*
 %{_mandir}/man1/pmlock.1*
 %{_mandir}/man1/pmlogcheck.1*
@@ -789,9 +1109,11 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %{_mandir}/man1/pmlogger_daily.1*
 %{_mandir}/man1/pmlogger_merge.1*
 %{_mandir}/man1/pmloglabel.1*
+%{_mandir}/man1/pmlogmv.1*
 %{_mandir}/man1/pmlogreduce.1*
 %{_mandir}/man1/pmlogrewrite.1*
 %{_mandir}/man1/pmlogsummary.1*
+%{_mandir}/man1/pmmgr.1*
 %{_mandir}/man1/pmnewlog.1*
 %{_mandir}/man1/pmnsadd.1*
 %{_mandir}/man1/pmnsdel.1*
@@ -805,10 +1127,63 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %{_mandir}/man1/pmstore.1*
 %{_mandir}/man1/pmtrace.1*
 %{_mandir}/man1/pmval.1*
+%{_mandir}/man1/pmwebd.1*
 %{_mandir}/man1/sar2pcp.1*
 %{_mandir}/man1/sheet2pcp.1*
 %{_mandir}/man1/telnet-probe.1*
 
+%if %{with qt}
+%files gui
+%defattr(644,root,root,755)
+%doc html
+%attr(755,root,root) %{_bindir}/pmchart
+%attr(755,root,root) %{_bindir}/pmconfirm
+%attr(755,root,root) %{_bindir}/pmdumptext
+%attr(755,root,root) %{_bindir}/pmmessage
+%attr(755,root,root) %{_bindir}/pmquery
+%attr(755,root,root) %{_bindir}/pmtime
+%attr(755,root,root) %{_libdir}/pcp/bin/pmsnap
+%dir %{_sysconfdir}/pcp/pmsnap
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcp/pmsnap/control
+%{_datadir}/pcp-gui
+%{_desktopdir}/pmchart.desktop
+%{_mandir}/man1/pmchart.1*
+%{_mandir}/man1/pmconfirm.1*
+%{_mandir}/man1/pmdumptext.1*
+%{_mandir}/man1/pmmessage.1*
+%{_mandir}/man1/pmquery.1*
+%{_mandir}/man1/pmsnap.1*
+%{_mandir}/man1/pmtime.1*
+/var/lib/pcp/config/pmafm/pcp-gui
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/CPU
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/ApacheServer
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Disk
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Diskbytes
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/ElasticsearchServer
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Filesystem
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Loadavg
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Memory
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/NFS2
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/NFS3
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Netbytes
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Netpackets
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Overview
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/PMCD
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Paging
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Schemes
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Sockets
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Swap
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Syscalls
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/vCPU
+%dir /var/lib/pcp/config/pmsnap
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmsnap/Snap
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmsnap/crontab
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmsnap/summary.html
+# pmview (enable when built, maybe subpackage?)
+#%{_mandir}/man1/pmview.1*
+#%{_mandir}/man5/pmview.5*
+%endif
+
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pminfo
@@ -835,21 +1210,27 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %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_linux
 /var/lib/pcp/pmns/root_mmv
 /var/lib/pcp/pmns/root_pmcd
+/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
+%{systemdtmpfilesdir}/pcp.conf
 %{_mandir}/man1/newhelp.1*
 %{_mandir}/man1/pmcpp.1*
 %{_mandir}/man1/pminfo.1*
 %{_mandir}/man1/pmnsmerge.1*
-%{_mandir}/man4/mmv.4*
-%{_mandir}/man4/pcp.conf.4*
-%{_mandir}/man4/pcp.env.4*
-%{_mandir}/man4/pmieconf.4*
-%{_mandir}/man4/pmns.4*
+%{_mandir}/man5/mmv.5*
+%{_mandir}/man5/pcp-archive.5*
+%{_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)
@@ -864,6 +1245,9 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %{_mandir}/man3/PCPIntro.3*
 %{_mandir}/man3/PMAPI.3*
 %{_mandir}/man3/PMDA.3*
+%{_mandir}/man3/PMWEBAPI.3*
+%{_mandir}/man3/QMC.3*
+%{_mandir}/man3/Qmc*.3*
 %{_mandir}/man3/__pm*.3*
 %{_mandir}/man3/mmv_*.3*
 %{_mandir}/man3/pm*.3*
@@ -903,11 +1287,33 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 
 %files -n python-pcp
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/pmapi.so
-%{py_sitedir}/pcp.py[co]
-%{py_sitedir}/pcpi.py[co]
-%{py_sitedir}/pcp-0.2-py*.egg-info
+%attr(755,root,root) %{py_sitedir}/cmmv.so
+%attr(755,root,root) %{py_sitedir}/cpmapi.so
+%attr(755,root,root) %{py_sitedir}/cpmda.so
+%attr(755,root,root) %{py_sitedir}/cpmgui.so
+%attr(755,root,root) %{py_sitedir}/cpmi.so
+%dir %{py_sitedir}/pcp
+%{py_sitedir}/pcp/*.py[co]
+%{py_sitedir}/pcp-1.0-py*.egg-info
+
+%files -n python3-pcp
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py3_sitedir}/cmmv.cpython-*.so
+%attr(755,root,root) %{py3_sitedir}/cpmapi.cpython-*.so
+%attr(755,root,root) %{py3_sitedir}/cpmda.cpython-*.so
+%attr(755,root,root) %{py3_sitedir}/cpmgui.cpython-*.so
+%attr(755,root,root) %{py3_sitedir}/cpmi.cpython-*.so
+%dir %{py3_sitedir}/pcp
+%{py3_sitedir}/pcp/*.py
+%{py3_sitedir}/pcp/__pycache__
+%{py3_sitedir}/pcp-1.0-py*.egg-info
 
 %files -n bash-completion-pcp
 %defattr(644,root,root,755)
 /etc/bash_completion.d/pcp
+
+%if %{with systemtap}
+%files -n systemtap-pcp
+%defattr(644,root,root,755)
+%{_datadir}/systemtap/tapset/pmcd.stp
+%endif