From 284d3ea1be54060ad4d7abe4feaf7d3bc32f8185 Mon Sep 17 00:00:00 2001
From: Lukas Berk <lberk@redhat.com>
Date: Mon, 30 Nov 2015 09:23:34 -0500
Subject: [PATCH] Automated weekly pcp rawhide release: 0.20151130gitd63273c

---
 .gitignore |  3 +++
 pcp.spec   | 37 +++++++++++++++++++++++++++++--------
 sources    |  6 +++---
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6334d8b..c268d3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,6 @@ pcp-3.3.3-1.src.tar.gz
 /pcp-3.10.9-0.20151123git587e16f.tar.gz
 /pcp-webjs-20151123git09da29d.src.tar.gz
 /vector-20151123git47fe02d.tar.gz
+/pcp-3.10.9-0.20151130gitd63273c.tar.gz
+/pcp-webjs-20151130git09da29d.src.tar.gz
+/vector-20151130git47fe02d.tar.gz
diff --git a/pcp.spec b/pcp.spec
index c4d652d..055f148 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -3,16 +3,16 @@ Name: pcp
 Version: 3.10.9
 %global buildversion 0
 
-Release: 0.20151123git587e16f%{?dist}
+Release: 0.20151130gitd63273c%{?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: %{name}-%{version}-0.20151123git587e16f.tar.gz
+Source0: %{name}-%{version}-0.20151130gitd63273c.tar.gz
 # https://github.com/performancecopilot/pcp-webjs/archive/master.zip
-Source1: pcp-webjs-20151123git09da29d.src.tar.gz
+Source1: pcp-webjs-20151130git09da29d.src.tar.gz
 # https://bintray.com/artifact/download/netflixoss/downloads/vector.tar.gz
-Source2: vector-20151123git47fe02d.tar.gz
+Source2: vector-20151130git47fe02d.tar.gz
 
 # Compat check for distros that already have single install pmda's
 %if 0%{?fedora} > 22 || 0%{?rhel} > 7
@@ -520,6 +520,20 @@ Requires: perl-PCP-LogImport = %{version}-%{release}
 Performance Co-Pilot (PCP) front-end tools for importing ganglia data
 into standard PCP archive logs for replay with any PCP monitoring tool.
 
+#
+# pcp-export-pcp2zabbix
+#
+%package export-pcp2zabbix
+License: GPLv2+
+Group: Applications/System
+Summary: Performance Co-Pilot tools for exporting PCP metrics to Zabbix
+URL: http://www.pcp.io
+Requires: pcp-libs >= %{version}-%{release}
+
+%description export-pcp2zabbix
+Performance Co-Pilot (PCP) front-end tools for exporting metric values
+to Zabbix (http://www.zabbix.com).
+
 %if !%{disable_python2} || !%{disable_python3}
 #
 # pcp-export-pcp2graphite
@@ -1729,7 +1743,7 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
 
 # all base pcp package files except those split out into sub packages
 ls -1 $RPM_BUILD_ROOT/%{_bindir} |\
-  grep -E -v 'pmiostat|pmcollectl|pmatop|pcp2graphite' |\
+  grep -E -v 'pmiostat|pmcollectl|pmatop|pcp2graphite|zabbix' |\
   sed -e 's#^#'%{_bindir}'\/#' >base_bin.list
 #
 # Separate the pcp-system-tools package files.
@@ -2299,13 +2313,16 @@ cd
 %files pmda-unbound
 %{_pmdasdir}/unbound
 
-%files export-pcp2graphite
-%{_bindir}/pcp2graphite
-
 %files pmda-mic
 %{_pmdasdir}/mic
+
+%files export-pcp2graphite
+%{_bindir}/pcp2graphite
 %endif # !%{disable_python2} || !%{disable_python3}
 
+%files export-pcp2zabbix
+%{_localstatedir}/lib/zabbix
+
 %if !%{disable_json}
 %files pmda-json
 %{_pmdasdir}/json
@@ -2403,6 +2420,10 @@ cd
 %endif
 
 %changelog
+* Mon Nov 30 2015 Lukas Berk <lberk@redhat.com> - 3.10.9-0.20151130gitd63273c
+- Automated weekly rawhide release
+- Applied spec changes from upstream git
+
 * Mon Nov 23 2015 Lukas Berk <lberk@redhat.com> - 3.10.9-0.20151123git587e16f
 - Automated weekly rawhide release
 
diff --git a/sources b/sources
index eec0c0d..6017b0b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-a658c5415387193293d8b5d9cd96b668  pcp-3.10.9-0.20151123git587e16f.tar.gz
-035a120efbb02c051abe60a231d2fcb4  pcp-webjs-20151123git09da29d.src.tar.gz
-793f7f7c4b314feb553ad20d7a6ce0a4  vector-20151123git47fe02d.tar.gz
+35dfffaeec0ffac62414e6bf6f49c4ec  pcp-3.10.9-0.20151130gitd63273c.tar.gz
+035a120efbb02c051abe60a231d2fcb4  pcp-webjs-20151130git09da29d.src.tar.gz
+b4eb5f05a888b6f2ced78fd15cf32320  vector-20151130git47fe02d.tar.gz