diff --git a/.gitignore b/.gitignore index a34c98c..08e5a3c 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,6 @@ pcp-3.3.3-1.src.tar.gz /pcp-webjs-20151214git17704ea.src.tar.gz /vector-20151214git117404f.tar.gz /pcp-3.10.9.src.tar.gz +/pcp-3.11.0-0.20160128giteb5eb32.tar.gz +/pcp-webjs-20160128gitddff69a.src.tar.gz +/vector-20160128git117404f.tar.gz diff --git a/pcp.spec b/pcp.spec index 0d5e327..7e5771a 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,25 +1,18 @@ Summary: System-level performance monitoring and performance management Name: pcp -Version: 3.10.9 -%global buildversion 1 +Version: 3.11.0 +%global buildversion 0 -Release: %{buildversion}%{?dist} +Release: 0.20160128giteb5eb32%{?dist} License: GPLv2+ and LGPLv2.1+ and CC-BY URL: http://www.pcp.io Group: Applications/System # https://bintray.com/artifact/download/pcp/source/pcp-%{version}.src.tar.gz -Source0: pcp-%{version}.src.tar.gz +Source0: %{name}-%{version}-0.20160128giteb5eb32.tar.gz # https://github.com/performancecopilot/pcp-webjs/archive/master.zip -Source1: pcp-webjs.src.tar.gz +Source1: pcp-webjs-20160128gitddff69a.src.tar.gz # https://bintray.com/artifact/download/netflixoss/downloads/vector.tar.gz -Source2: vector.tar.gz - -# Compat check for distros that already have single install pmda's -%if 0%{?fedora} > 22 || 0%{?rhel} > 7 -%global with_compat 0 -%else -%global with_compat 1 -%endif +Source2: vector-20160128git117404f.tar.gz # There are no papi/libpfm devel packages for s390 nor for some rhels, disable %ifarch s390 s390x @@ -117,6 +110,7 @@ BuildRequires: procps autoconf bison flex BuildRequires: nss-devel BuildRequires: rpm-devel BuildRequires: avahi-devel +BuildRequires: zlib-devel %if !%{disable_python2} %if 0%{?default_python} != 3 BuildRequires: python%{?default_python}-devel @@ -167,9 +161,9 @@ Requires: python-pcp = %{version}-%{release} Obsoletes: pcp-gui-debuginfo Obsoletes: pcp-pmda-nvidia -%if %{with_compat} -Requires: pcp-compat -%endif +# Obsoletes for distros that already have single install pmda's with compat package +Obsoletes: pcp-compat + Requires: pcp-libs = %{version}-%{release} Obsoletes: pcp-gui-debuginfo @@ -528,13 +522,13 @@ into standard PCP archive logs for replay with any PCP monitoring tool. %package export-zabbix-agent License: GPLv2+ Group: Applications/System -Summary: Module for exporting from PCP into a Zabbix agent daemon +Summary: Module for exporting PCP metrics to Zabbix agent URL: http://www.pcp.io -Requires: pcp-libs >= %{version}-%{release} +Requires: pcp-libs = %{version}-%{release} %description export-zabbix-agent -Performance Co-Pilot (PCP) module for exporting data from PCP via a -designated Zabbix agent daemon - see zbxpcp(3) for further details. +Performance Co-Pilot (PCP) module for exporting metrics from PCP to +Zabbix via the Zabbix agent - see zbxpcp(3) for further details. %if !%{disable_python2} || !%{disable_python3} # @@ -1014,6 +1008,7 @@ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Simple Network Management Protocol URL: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Requires: perl(Net::SNMP) %description pmda-snmp This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1429,41 +1424,6 @@ collecting metrics about web server logs. # end pcp-pmda-weblog # end C pmdas -# -# pcp-compat -# -%if %{with_compat} -%package compat -License: GPLv2+ -Group: Applications/System -Summary: Performance Co-Pilot (PCP) compat package for existing systems -URL: http://www.pcp.io -Requires: pcp-pmda-activemq pcp-pmda-bonding pcp-pmda-dbping pcp-pmda-ds389 pcp-pmda-ds389log -Requires: pcp-pmda-elasticsearch pcp-pmda-gpfs pcp-pmda-gpsd pcp-pmda-kvm pcp-pmda-lustre -Requires: pcp-pmda-memcache pcp-pmda-mysql pcp-pmda-named pcp-pmda-netfilter pcp-pmda-news -Requires: pcp-pmda-nginx pcp-pmda-nfsclient pcp-pmda-pdns pcp-pmda-postfix pcp-pmda-postgresql -Requires: pcp-pmda-dm pcp-pmda-apache -Requires: pcp-pmda-bash pcp-pmda-cisco pcp-pmda-gfs2 pcp-pmda-lmsensors pcp-pmda-mailq pcp-pmda-mounts -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-mic -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 -This package contains the PCP compatibility dependencies for existing PCP -installations. This is not a package that should be depended on, and will -be removed in future releases. -%endif #compat - # pcp-collector metapackage %package collector License: GPLv2+ @@ -2092,11 +2052,6 @@ cd %{tapsetdir}/pmcd.stp %endif -%if %{with_compat} -%files compat -#empty -%endif - %files monitor #empty @@ -2423,6 +2378,10 @@ cd %endif %changelog +* Thu Jan 28 2016 Lukas Berk - 3.11.0-0.20160128giteb5eb32 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Wed Dec 16 2015 Lukas Berk - 3.10.9-1 - Add -V/--version support to several more commands (BZ 1284411) - Resolve a pcp-iostat(1) transient device exception (BZ 1249572) diff --git a/sources b/sources index b1429df..b40c6de 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -82b00227db623e12bf47eca6f12d3979 pcp-3.10.9.src.tar.gz -3dbb7ac87a588a97b639a45b136933b2 pcp-webjs.src.tar.gz -2d3001cd3c9464060a4260ea7364c3d0 vector.tar.gz +0388245469ecb15d7bc2df6a7b991f21 pcp-3.11.0-0.20160128giteb5eb32.tar.gz +7f35c35a963a9ff931ed0f9c1de64ad0 pcp-webjs-20160128gitddff69a.src.tar.gz +fc30f9ec74e2ec912e5d9b14ac93eb08 vector-20160128git117404f.tar.gz