From 00297922926f7f6a253294b81a7fa6669c8c4d064673de18dd328c28418ed4ef Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss@suse.com>
Date: Tue, 3 Mar 2015 22:36:09 +0000
Subject: [PATCH] Accepting request 288688 from home:dmdiss:pcp_threeten

- Update to 3.10.3
  See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=3.10.3
- New sub-package
  + pcp-import-ganglia2pcp

OBS-URL: https://build.opensuse.org/request/show/288688
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=42
---
 pcp-3.10.2.src.tar.gz |  3 ---
 pcp-3.10.3.src.tar.gz |  3 +++
 pcp.changes           |  9 +++++++++
 pcp.spec              | 26 ++++++++++++++++++++++++--
 4 files changed, 36 insertions(+), 5 deletions(-)
 delete mode 100644 pcp-3.10.2.src.tar.gz
 create mode 100644 pcp-3.10.3.src.tar.gz

diff --git a/pcp-3.10.2.src.tar.gz b/pcp-3.10.2.src.tar.gz
deleted file mode 100644
index 1d8772b..0000000
--- a/pcp-3.10.2.src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c641c26a476f1743c17590a39c1b19edb9fc4becc16a910d92c72a4c3eeda01a
-size 14111630
diff --git a/pcp-3.10.3.src.tar.gz b/pcp-3.10.3.src.tar.gz
new file mode 100644
index 0000000..a7cac8e
--- /dev/null
+++ b/pcp-3.10.3.src.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f7b72596e687c2dc0d8ab775d26dc2bf08463440d9f39dd7009cdd3faf3e054
+size 14205088
diff --git a/pcp.changes b/pcp.changes
index 4f9c873..9c28f63 100644
--- a/pcp.changes
+++ b/pcp.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Mar  3 14:08:18 UTC 2015 - ddiss@suse.com
+
+- Update to 3.10.3
+  See http://git.pcp.io/cgi-bin/gitweb.cgi?p=pcp/pcp.git;a=blob_plain;f=CHANGELOG;hb=3.10.3
+
+- New sub-package
+  + pcp-import-ganglia2pcp
+
 -------------------------------------------------------------------
 Fri Feb 27 13:18:15 UTC 2015 - ddiss@suse.com
 
diff --git a/pcp.spec b/pcp.spec
index 796f4c2..6accc9c 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package pcp
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -63,7 +63,7 @@ Summary:        System-level performance monitoring and performance management
 License:        %{license_gplv2plus} and %{license_lgplv2plus} and %{license_cc_by}
 Group:          %{pcp_gr}
 Name:           pcp
-Version:        3.10.2
+Version:        3.10.3
 Release:        0
 %define buildversion 1
 
@@ -600,6 +600,23 @@ Requires:       perl-PCP-LogImport = %{version}-%{release}
 Performance Co-Pilot (PCP) front-end tools for importing MTRG data
 into standard PCP archive logs for replay with any PCP monitoring tool.
 
+#
+# pcp-import-ganglia2pcp
+#
+%package import-ganglia2pcp
+Summary:        Performance Co-Pilot tools for importing ganglia data into PCP archive logs
+License:        %{license_lgplv2plus}
+Group:          %{pcp_gr}
+Url:            http://www.pcp.io
+%if !0%{?suse_version}
+Requires:       pcp-libs = %{version}-%{release}
+%endif
+Requires:       perl-PCP-LogImport = %{version}-%{release}
+
+%description import-ganglia2pcp
+Performance Co-Pilot (PCP) front-end tools for importing ganglia data
+into standard PCP archive logs for replay with any PCP monitoring tool.
+
 #
 # pcp-import-collectl2pcp
 #
@@ -1422,6 +1439,11 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
 %{_bindir}/mrtg2pcp
 %{_mandir}/man1/mrtg2pcp.1.gz
 
+%files import-ganglia2pcp
+%defattr(-,root,root)
+%{_bindir}/ganglia2pcp
+%{_mandir}/man1/ganglia2pcp.1.gz
+
 %files import-collectl2pcp
 %defattr(-,root,root)
 %{_bindir}/collectl2pcp