Automated weekly pcp rawhide release: 0.20150713git9c4f78f

This commit is contained in:
Lukas Berk 2015-07-13 08:43:52 -04:00
parent e911a592a7
commit c3ac25372e
3 changed files with 163 additions and 111 deletions

1
.gitignore vendored
View File

@ -54,3 +54,4 @@ pcp-3.3.3-1.src.tar.gz
/pcp-3.10.4.src.tar.gz
/pcp-3.10.5-0.20150601git9478ca0.tar.gz
/pcp-3.10.5.src.tar.gz
/pcp-3.10.6-0.20150713git9c4f78f.tar.gz

271
pcp.spec
View File

@ -1,14 +1,13 @@
Summary: System-level performance monitoring and performance management
Name: pcp
Version: 3.10.5
%global buildversion 1
Version: 3.10.6
%global buildversion 0
Release: %{buildversion}%{?dist}.1
Release: 0.20150713git9c4f78f%{?dist}
License: GPLv2+ and LGPLv2.1+ and CC-BY
URL: http://www.pcp.io
Group: Applications/System
Source0: ftp://ftp.pcp.io/projects/pcp/download/%{name}-%{version}.src.tar.gz
# From: git://sourceware.org/git/pcpfans.git --branch=webjs
Source0: %{name}-%{version}-0.20150713git9c4f78f.tar.gz
Source1: pcp-webjs.src.tar.gz
# Compat check for distros that already have single install pmda's
@ -43,7 +42,7 @@ Source1: pcp-webjs.src.tar.gz
%if 0%{?rhel} == 5
%global default_python 26
%endif
# No python3 development environment before el7
# No python3 development environment before el8
%if 0%{?rhel} == 0 || 0%{?rhel} > 7
%global disable_python3 0
# Do we wish to mandate python3 use in pcp? (f22+ and el8+)
@ -54,6 +53,24 @@ Source1: pcp-webjs.src.tar.gz
%global disable_python3 1
%endif
# support for pmdajson
%if 0%{?rhel} == 0 || 0%{?rhel} > 6
%if !%{disable_python2} || !%{disable_python3}
%global disable_json 0
%else
%global disable_json 1
%endif
%else
%global disable_json 1
%endif
# support for pmdarpm
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
%global disable_rpm 0
%else
%global disable_rpm 1
%endif
# Qt development and runtime environment missing components before el6
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
%global disable_qt 0
@ -61,6 +78,31 @@ Source1: pcp-webjs.src.tar.gz
%global disable_qt 1
%endif
# systemd services and pmdasystemd
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
%global disable_systemd 0
%else
%global disable_systemd 1
%endif
# systemtap static probing, missing before el6 and on some architectures
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
%ifnarch ppc ppc64
%global disable_sdt 0
%else
%global disable_sdt 1
%endif
%else
%global disable_sdt 1
%endif
# rpm producing "noarch" packages
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
%global disable_noarch 0
%else
%global disable_noarch 1
%endif
# prevent conflicting binary and man page install for pcp(1)
Conflicts: librapi
@ -94,16 +136,12 @@ BuildRequires: libmicrohttpd-devel
%if !%{disable_cairo}
BuildRequires: cairo-devel
%endif
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
%if !%{disable_sdt}
BuildRequires: systemtap-sdt-devel
%else
%ifnarch ppc ppc64
BuildRequires: systemtap-sdt-devel
%endif
%endif
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: initscripts man
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
%if !%{disable_systemd}
BuildRequires: systemd-devel
%endif
%if !%{disable_qt}
@ -137,13 +175,11 @@ Obsoletes: pcp-pmda-nvidia
%if 0%{?fedora} >= 20 || 0%{?rhel} >= 8
%global _with_doc --with-docdir=%{_docdir}/%{name}
%endif
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
%if %{disable_systemd}
%global _initddir %{_datadir}/pcp/lib
%global disable_systemd 0
%else
%global _initddir %{_sysconfdir}/rc.d/init.d
%global _with_initd --with-rcdir=%{_initddir}
%global disable_systemd 1
%endif
# we never want Infiniband on s390 platforms
@ -170,6 +206,12 @@ Obsoletes: pcp-pmda-nvidia
%global _with_perfevent --with-perfevent=yes
%endif
%if %{disable_json}
%global _with_json --with-pmdajson=no
%else
%global _with_json --with-pmdajson=yes
%endif
%description
Performance Co-Pilot (PCP) provides a framework and services to support
system-level performance monitoring and performance management.
@ -181,7 +223,7 @@ applications to easily retrieve and process any subset of that data.
%if %{with_compat}
Requires: pcp-compat
%endif
Requires: pcp-libs = @package_version@
Requires: pcp-libs = %{version}-%{release}
Obsoletes: pcp-gui-debuginfo
#
@ -283,7 +325,7 @@ HTTP (PMWEBAPI) protocol.
%package webjs
License: ASL2.0 and MIT and CC-BY
Group: Applications/Internet
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
%if !%{disable_noarch}
BuildArch: noarch
%endif
Requires: pcp-webapp-graphite pcp-webapp-grafana pcp-webapp-vector
@ -297,7 +339,7 @@ web service.
%package webapp-vector
License: ASL2.0
Group: Applications/Internet
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
%if !%{disable_noarch}
BuildArch: noarch
%endif
Summary: Vector web application for Performance Co-Pilot (PCP)
@ -310,7 +352,7 @@ Vector web application for the Performance Co-Pilot (PCP).
License: ASL2.0
Group: Applications/Internet
Conflicts: pcp-webjs < 3.10.4
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
%if !%{disable_noarch}
BuildArch: noarch
%endif
Summary: Grafana web application for Performance Co-Pilot (PCP)
@ -330,7 +372,7 @@ server via png (less interactive, faster).
License: ASL2.0
Group: Applications/Internet
Conflicts: pcp-webjs < 3.10.4
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
%if !%{disable_noarch}
BuildArch: noarch
%endif
Summary: Graphite web application for Performance Co-Pilot (PCP)
@ -1078,6 +1120,9 @@ collecting metrics about the Unbound DNS Resolver. The PMDA is written
in Python.
# end pcp-pmda-unbound
%endif # !%{disable_python2} || !%{disable_python3}
%if !%{disable_json}
#
# pcp-pmda-json
#
@ -1090,21 +1135,16 @@ URL: http://www.pcp.io
Requires: python3-pcp
Requires: python3-jsonpointer
Requires: python3-six
BuildRequires: python3-jsonpointer
BuildRequires: python3-six
%else
Requires: python-pcp
Requires: python-jsonpointer
Requires: python-six
BuildRequires: python-jsonpointer
BuildRequires: python-six
%endif
%description pmda-json
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
collecting metrics output in JSON. The PMDA is written in Python.
# end pcp-pmda-json
%endif # !%{disable_python2} || !%{disable_python3}
%endif
#
# C pmdas
@ -1265,6 +1305,7 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for
collecting metrics about the Room temperature metrics. The PMDA is written in C.
# end pcp-pmda-roomtemp
%if !%{disable_rpm}
#
# pcp-pmda-rpm
#
@ -1278,7 +1319,7 @@ Requires: pcp = %{version}-%{release}
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
collecting metrics about the rpms. The PMDA is written in C.
# end pcp-pmda-rpm
%endif
#
# pcp-pmda-sendmail
@ -1323,7 +1364,7 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for
collecting metrics about other installed pmdas. The PMDA is written in C.
# end pcp-pmda-summary
### %if "@pmda_systemd@" == "true"
%if !%{disable_systemd}
#
# pcp-pmda-systemd
#
@ -1337,7 +1378,7 @@ Requires: pcp-libs = %{version}-%{release}
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
collecting metrics about the Systemd shell. The PMDA is written in C.
# end pcp-pmda-systemd
### %endif
%endif # 0%{?fedora} >= 18 || 0%{?rhel} >= 7
#
# pcp-pmda-trace
@ -1387,10 +1428,15 @@ Requires: pcp-pmda-bash pcp-pmda-cisco pcp-pmda-gfs2 pcp-pmda-lmsensors pcp-pmda
Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shping pcp-pmda-logger
Requires: pcp-pmda-lustrecomm
%if !%{disable_python2} || !%{disable_python3}
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-json
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound
Requires: pcp-system-tools pcp-export-pcp2graphite
%endif
%if !%{disable_json}
Requires: pcp-pmda-json
%endif
%if !%{disable_rpm}
Requires: pcp-pmda-rpm
%endif
Requires: pcp-pmda-summary pcp-pmda-trace pcp-pmda-weblog
Requires: pcp-doc
%description compat
@ -1415,9 +1461,14 @@ Requires: pcp-pmda-bash pcp-pmda-cisco pcp-pmda-gfs2 pcp-pmda-lmsensors pcp-pmda
Requires: pcp-pmda-nvidia-gpu pcp-pmda-roomtemp pcp-pmda-sendmail pcp-pmda-shping
Requires: pcp-pmda-lustrecomm pcp-pmda-logger
%if !%{disable_python2} || !%{disable_python3}
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-json
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound
%endif
%if !%{disable_json}
Requires: pcp-pmda-json
%endif
%if !%{disable_rpm}
Requires: pcp-pmda-rpm
%endif
Requires: pcp-pmda-summary pcp-pmda-trace pcp-pmda-weblog
%description collector
This package contains the PCP metric collection dependencies. This includes
@ -1489,7 +1540,8 @@ Summary: Performance Co-Pilot (PCP) System and Monitoring Tools
URL: http://www.pcp.io
%if !%{disable_python3}
Requires: python3-pcp = %{version}-%{release}
%else
%endif
%if !%{disable_python2}
Requires: python-pcp = %{version}-%{release}
%endif
%description -n pcp-system-tools
@ -1521,11 +1573,15 @@ monitoring systems using live and archived Performance Co-Pilot
%package -n pcp-doc
License: GPLv2+ and CC-BY
Group: Documentation
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
%if !%{disable_noarch}
BuildArch: noarch
%endif
Summary: Documentation and tutorial for the Performance Co-Pilot
URL: http://www.pcp.io
# http://fedoraproject.org/wiki/Packaging:Conflicts "Splitting Packages"
# (all man pages migrated to pcp-doc during great package split of '15)
Conflicts: pcp-pmda-pmda < 3.10.5
Conflicts: pcp-pmda-infiniband < 3.10.5
%description -n pcp-doc
Documentation and tutorial for the Performance Co-Pilot
@ -1580,7 +1636,6 @@ rmdir pcp-webjs
%if %{disable_infiniband}
# remove pmdainfiniband on platforms lacking IB devel packages.
rm -f $RPM_BUILD_ROOT/%{_pmdasdir}/ib
rm -f $RPM_BUILD_ROOT/%{_mandir}/man1/pmdaib.1*
rm -fr $RPM_BUILD_ROOT/%{_pmdasdir}/infiniband
%endif
@ -1614,80 +1669,73 @@ done
# list of PMDAs in the base pkg
ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
grep -E -v 'simple|sample|trivial|txmon' |\
grep -E -v 'perfevent|perfalloc.1' |\
grep -E -v '^ib$|infiniband' |\
grep -E -v 'papi' |\
grep -E -v 'activemq' |\
grep -E -v 'bonding' |\
grep -E -v 'dbping' |\
grep -E -v 'ds389log'|\
grep -E -v 'ds389' |\
grep -E -v 'elasticsearch' |\
grep -E -v 'gpfs' |\
grep -E -v 'gpsd' |\
grep -E -v 'kvm' |\
grep -E -v 'lustre' |\
grep -E -v 'lustrecomm' |\
grep -E -v 'memcache' |\
grep -E -v 'mysql' |\
grep -E -v 'named' |\
grep -E -v 'netfilter' |\
grep -E -v 'news' |\
grep -E -v 'nfsclient' |\
grep -E -v 'nginx' |\
grep -E -v 'pdns' |\
grep -E -v 'postfix' |\
grep -E -v 'postgresql' |\
grep -E -v 'rsyslog' |\
grep -E -v 'samba' |\
grep -E -v 'snmp' |\
grep -E -v 'vmware' |\
grep -E -v 'zimbra' |\
grep -E -v 'dm' |\
grep -E -v 'apache' |\
grep -E -v 'bash' |\
grep -E -v 'cifs' |\
grep -E -v 'cisco' |\
grep -E -v 'gfs2' |\
grep -E -v 'lmsensors' |\
grep -E -v 'logger' |\
grep -E -v 'mailq' |\
grep -E -v 'mounts' |\
grep -E -v 'nvidia' |\
grep -E -v 'roomtemp' |\
grep -E -v 'rpm' |\
grep -E -v 'sendmail' |\
grep -E -v 'shping' |\
grep -E -v 'summary' |\
grep -E -v 'trace' |\
grep -E -v 'weblog' |\
%if !%{disable_python2} || !%{disable_python3}
grep -E -v 'gluster' |\
grep -E -v 'zswap' |\
grep -E -v 'unbound' |\
grep -E -v 'json' |\
%endif
grep -E -v '^simple|sample|trivial|txmon' |\
grep -E -v '^perfevent|perfalloc.1' |\
grep -E -v '^ib$|^infiniband' |\
grep -E -v '^papi' |\
grep -E -v '^activemq' |\
grep -E -v '^bonding' |\
grep -E -v '^dbping' |\
grep -E -v '^ds389log'|\
grep -E -v '^ds389' |\
grep -E -v '^elasticsearch' |\
grep -E -v '^gpfs' |\
grep -E -v '^gpsd' |\
grep -E -v '^kvm' |\
grep -E -v '^lustre' |\
grep -E -v '^lustrecomm' |\
grep -E -v '^memcache' |\
grep -E -v '^mysql' |\
grep -E -v '^named' |\
grep -E -v '^netfilter' |\
grep -E -v '^news' |\
grep -E -v '^nfsclient' |\
grep -E -v '^nginx' |\
grep -E -v '^pdns' |\
grep -E -v '^postfix' |\
grep -E -v '^postgresql' |\
grep -E -v '^rsyslog' |\
grep -E -v '^samba' |\
grep -E -v '^snmp' |\
grep -E -v '^vmware' |\
grep -E -v '^zimbra' |\
grep -E -v '^dm' |\
grep -E -v '^apache' |\
grep -E -v '^bash' |\
grep -E -v '^cifs' |\
grep -E -v '^cisco' |\
grep -E -v '^gfs2' |\
grep -E -v '^lmsensors' |\
grep -E -v '^logger' |\
grep -E -v '^mailq' |\
grep -E -v '^mounts' |\
grep -E -v '^nvidia' |\
grep -E -v '^roomtemp' |\
grep -E -v '^sendmail' |\
grep -E -v '^shping' |\
grep -E -v '^summary' |\
grep -E -v '^trace' |\
grep -E -v '^weblog' |\
grep -E -v '^rpm' |\
grep -E -v '^json' |\
grep -E -v '^gluster' |\
grep -E -v '^zswap' |\
grep -E -v '^unbound' |\
sed -e 's#^#'%{_pmdasdir}'\/#' >base_pmdas.list
# all base pcp package files except those split out into sub packages
ls -1 $RPM_BUILD_ROOT/%{_bindir} |\
grep -E -v 'pmiostat|pmatop|pcp2graphite' |\
grep -E -v 'pmiostat|pmcollectl|pmatop|pcp2graphite' |\
sed -e 's#^#'%{_bindir}'\/#' >base_bin.list
#
# Seperate the pcp-system-tools package files.
# Separate the pcp-system-tools package files.
#
# pmatop and pmiostat (and other python client tools) are symlinks to the
# pcp-foo variant, and so should also be in pcp-system-tools
# pmatop, pmcollectl and pmiostat are back-compat symlinks to their
# pcp(1) sub-command variants so must also be in pcp-system-tools.
%if !%{disable_python2} || !%{disable_python3}
ls -1 $RPM_BUILD_ROOT/%{_bindir} |\
grep -E 'pmiostat|pmatop' |\
grep -E 'pmiostat|pmcollectl|pmatop' |\
sed -e 's#^#'%{_bindir}'\/#' >pcp_system_tools.list
%endif
%if !%{disable_python2} || !%{disable_python3}
ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\
grep -E 'atop|collectl|dmcache|free|iostat|numastat|verify|uptime|shping' |\
sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >>pcp_system_tools.list
@ -1998,14 +2046,8 @@ cd
%{_localstatedir}/lib/pcp/config/pmlogrewrite
%dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmda
%if 0%{?rhel} == 0 || 0%{?rhel} > 5
%if !%{disable_sdt}
%{tapsetdir}/pmcd.stp
%else # rhel5
%ifarch ppc ppc64
# no systemtap-sdt-devel
%else # ! ppc
%{tapsetdir}/pmcd.stp
%endif # ppc
%endif
%if %{with_compat}
@ -2226,14 +2268,15 @@ cd
%files pmda-unbound
%{_pmdasdir}/unbound
%files pmda-json
%{_pmdasdir}/json
%files export-pcp2graphite
%{_bindir}/pcp2graphite
%endif # !%{disable_python2} || !%{disable_python3}
%if !%{disable_json}
%files pmda-json
%{_pmdasdir}/json
%endif
%files pmda-apache
%{_pmdasdir}/apache
@ -2267,8 +2310,10 @@ cd
%files pmda-roomtemp
%{_pmdasdir}/roomtemp
%if !%{disable_rpm}
%files pmda-rpm
%{_pmdasdir}/rpm
%endif
%files pmda-sendmail
%{_pmdasdir}/sendmail
@ -2279,8 +2324,10 @@ cd
%files pmda-summary
%{_pmdasdir}/summary
%if !%{disable_systemd}
%files pmda-systemd
%{_pmdasdir}/systemd
%endif
%files pmda-trace
%{_pmdasdir}/trace
@ -2322,6 +2369,10 @@ cd
%endif
%changelog
* Mon Jul 13 2015 Lukas Berk <lberk@redhat.com> - 3.10.6-0.20150713git9c4f78f
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.10.5-1.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

View File

@ -1,2 +1,2 @@
9fc23f68769de375d35e629b8a879f10 pcp-3.10.5.src.tar.gz
33df2d5c803eef8be195c0ed7e5f02d0 pcp-3.10.6-0.20150713git9c4f78f.tar.gz
628bb0764c2ee9647a79ed50136ed12f pcp-webjs.src.tar.gz