Automated weekly pcp rawhide release: 0.20151207gited763bb

This commit is contained in:
Lukas Berk 2015-12-07 10:58:40 -05:00
parent 284d3ea1be
commit ae308aa80b
3 changed files with 24 additions and 17 deletions

3
.gitignore vendored
View File

@ -61,3 +61,6 @@ pcp-3.3.3-1.src.tar.gz
/pcp-3.10.9-0.20151130gitd63273c.tar.gz /pcp-3.10.9-0.20151130gitd63273c.tar.gz
/pcp-webjs-20151130git09da29d.src.tar.gz /pcp-webjs-20151130git09da29d.src.tar.gz
/vector-20151130git47fe02d.tar.gz /vector-20151130git47fe02d.tar.gz
/pcp-3.10.9-0.20151207gited763bb.tar.gz
/pcp-webjs-20151207git09da29d.src.tar.gz
/vector-20151207git0ec9197.tar.gz

View File

@ -3,16 +3,16 @@ Name: pcp
Version: 3.10.9 Version: 3.10.9
%global buildversion 0 %global buildversion 0
Release: 0.20151130gitd63273c%{?dist} Release: 0.20151207gited763bb%{?dist}
License: GPLv2+ and LGPLv2.1+ and CC-BY License: GPLv2+ and LGPLv2.1+ and CC-BY
URL: http://www.pcp.io URL: http://www.pcp.io
Group: Applications/System Group: Applications/System
# https://bintray.com/artifact/download/pcp/source/pcp-%{version}.src.tar.gz # https://bintray.com/artifact/download/pcp/source/pcp-%{version}.src.tar.gz
Source0: %{name}-%{version}-0.20151130gitd63273c.tar.gz Source0: %{name}-%{version}-0.20151207gited763bb.tar.gz
# https://github.com/performancecopilot/pcp-webjs/archive/master.zip # https://github.com/performancecopilot/pcp-webjs/archive/master.zip
Source1: pcp-webjs-20151130git09da29d.src.tar.gz Source1: pcp-webjs-20151207git09da29d.src.tar.gz
# https://bintray.com/artifact/download/netflixoss/downloads/vector.tar.gz # https://bintray.com/artifact/download/netflixoss/downloads/vector.tar.gz
Source2: vector-20151130git47fe02d.tar.gz Source2: vector-20151207git0ec9197.tar.gz
# Compat check for distros that already have single install pmda's # Compat check for distros that already have single install pmda's
%if 0%{?fedora} > 22 || 0%{?rhel} > 7 %if 0%{?fedora} > 22 || 0%{?rhel} > 7
@ -521,18 +521,18 @@ Performance Co-Pilot (PCP) front-end tools for importing ganglia data
into standard PCP archive logs for replay with any PCP monitoring tool. into standard PCP archive logs for replay with any PCP monitoring tool.
# #
# pcp-export-pcp2zabbix # pcp-export-zabbix-agent
# #
%package export-pcp2zabbix %package export-zabbix-agent
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
Summary: Performance Co-Pilot tools for exporting PCP metrics to Zabbix Summary: Module for exporting from PCP into a Zabbix agent daemon
URL: http://www.pcp.io URL: http://www.pcp.io
Requires: pcp-libs >= %{version}-%{release} Requires: pcp-libs >= %{version}-%{release}
%description export-pcp2zabbix %description export-zabbix-agent
Performance Co-Pilot (PCP) front-end tools for exporting metric values Performance Co-Pilot (PCP) module for exporting data from PCP via a
to Zabbix (http://www.zabbix.com). designated Zabbix agent daemon - see zbxpcp(3) for further details.
%if !%{disable_python2} || !%{disable_python3} %if !%{disable_python2} || !%{disable_python3}
# #
@ -1743,7 +1743,7 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
# all base pcp package files except those split out into sub packages # all base pcp package files except those split out into sub packages
ls -1 $RPM_BUILD_ROOT/%{_bindir} |\ ls -1 $RPM_BUILD_ROOT/%{_bindir} |\
grep -E -v 'pmiostat|pmcollectl|pmatop|pcp2graphite|zabbix' |\ grep -E -v 'pmiostat|pmcollectl|pmatop|pmrep|pcp2graphite|zabbix|zbxpcp' |\
sed -e 's#^#'%{_bindir}'\/#' >base_bin.list sed -e 's#^#'%{_bindir}'\/#' >base_bin.list
# #
# Separate the pcp-system-tools package files. # Separate the pcp-system-tools package files.
@ -1752,7 +1752,7 @@ ls -1 $RPM_BUILD_ROOT/%{_bindir} |\
# pcp(1) sub-command variants so must also be in pcp-system-tools. # pcp(1) sub-command variants so must also be in pcp-system-tools.
%if !%{disable_python2} || !%{disable_python3} %if !%{disable_python2} || !%{disable_python3}
ls -1 $RPM_BUILD_ROOT/%{_bindir} |\ ls -1 $RPM_BUILD_ROOT/%{_bindir} |\
grep -E 'pmiostat|pmcollectl|pmatop' |\ grep -E 'pmiostat|pmcollectl|pmatop|pmrep' |\
sed -e 's#^#'%{_bindir}'\/#' >pcp_system_tools.list sed -e 's#^#'%{_bindir}'\/#' >pcp_system_tools.list
ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\
grep -E 'atop|collectl|dmcache|free|iostat|numastat|verify|uptime|shping' |\ grep -E 'atop|collectl|dmcache|free|iostat|numastat|verify|uptime|shping' |\
@ -2320,8 +2320,8 @@ cd
%{_bindir}/pcp2graphite %{_bindir}/pcp2graphite
%endif # !%{disable_python2} || !%{disable_python3} %endif # !%{disable_python2} || !%{disable_python3}
%files export-pcp2zabbix %files export-zabbix-agent
%{_localstatedir}/lib/zabbix %{_libdir}/zabbix
%if !%{disable_json} %if !%{disable_json}
%files pmda-json %files pmda-json
@ -2420,6 +2420,10 @@ cd
%endif %endif
%changelog %changelog
* Mon Dec 07 2015 Lukas Berk <lberk@redhat.com> - 3.10.9-0.20151207gited763bb
- Automated weekly rawhide release
- Applied spec changes from upstream git
* Mon Nov 30 2015 Lukas Berk <lberk@redhat.com> - 3.10.9-0.20151130gitd63273c * Mon Nov 30 2015 Lukas Berk <lberk@redhat.com> - 3.10.9-0.20151130gitd63273c
- Automated weekly rawhide release - Automated weekly rawhide release
- Applied spec changes from upstream git - Applied spec changes from upstream git

View File

@ -1,3 +1,3 @@
35dfffaeec0ffac62414e6bf6f49c4ec pcp-3.10.9-0.20151130gitd63273c.tar.gz cce2f80405c553c104d0deb51179ef21 pcp-3.10.9-0.20151207gited763bb.tar.gz
035a120efbb02c051abe60a231d2fcb4 pcp-webjs-20151130git09da29d.src.tar.gz 035a120efbb02c051abe60a231d2fcb4 pcp-webjs-20151207git09da29d.src.tar.gz
b4eb5f05a888b6f2ced78fd15cf32320 vector-20151130git47fe02d.tar.gz 2074ccf9c0154f1f1d979a00839b7b80 vector-20151207git0ec9197.tar.gz