From c8e9f687fa9e47743a4c8c2540cb8cb924a3effa Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Wed, 19 Jun 2013 13:43:45 +1000
Subject: [PATCH] Update to latest community sources

---
 .gitignore |  1 +
 pcp.spec   | 30 ++++++++++++++++++++++++++++--
 sources    |  2 +-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d6dfb56..b10445f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ pcp-3.3.3-1.src.tar.gz
 /pcp-3.7.1.src.tar.gz
 /pcp-3.7.2.src.tar.gz
 /pcp-3.8.0.src.tar.gz
+/pcp-3.8.1.src.tar.gz
diff --git a/pcp.spec b/pcp.spec
index 3613f41..5c06af2 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,6 +1,6 @@
 Summary: System-level performance monitoring and performance management
 Name: pcp
-Version: 3.8.0
+Version: 3.8.1
 %define buildversion 1
 
 Release: %{buildversion}%{?dist}
@@ -24,7 +24,7 @@ BuildRequires: systemd-devel
 %endif
  
 Requires: bash gawk sed grep fileutils findutils initscripts perl
-Requires: python python-ctypes
+Requires: python
 
 Requires: pcp-libs = %{version}-%{release}
 Requires: python-pcp = %{version}-%{release}
@@ -202,6 +202,20 @@ 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-collectl2pcp
+#
+%package import-collectl2pcp
+License: LGPLv2+
+Group: Applications/System
+Summary: Performance Co-Pilot tools for importing collectl log files into PCP archive logs
+URL: http://oss.sgi.com/projects/pcp/
+Requires: pcp-libs >= %{version}-%{release}
+
+%description import-collectl2pcp
+Performance Co-Pilot (PCP) front-end tools for importing collectl data
+into standard PCP archive logs for replay with any PCP monitoring tool.
+
 #
 # python-pcp. This is the PCP library bindings for python.
 #
@@ -487,6 +501,11 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 %{_bindir}/mrtg2pcp
 %{_mandir}/man1/mrtg2pcp.1.gz
 
+%files import-collectl2pcp
+%defattr(-,root,root)
+%{_bindir}/collectl2pcp
+%{_mandir}/man1/collectl2pcp.1.gz
+
 %files -n perl-PCP-PMDA -f perl-pcp-pmda.list
 %defattr(-,root,root)
 
@@ -503,6 +522,13 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 %defattr(-,root,root)
 
 %changelog
+* Wed Jun 19 2013 Nathan Scott <nathans@redhat.com> - 3.8.1-1
+- Update to latest PCP sources.
+- Fix log import silently dropping >1024 metrics (BZ 968210)
+- Move some commonly used tools on the usual PATH (BZ 967709)
+- Improve pmatop handling of missing proc metrics (BZ 963085)
+- Stop out-of-order records corrupting import logs (BZ 958745)
+
 * Tue May 14 2013 Nathan Scott <nathans@redhat.com> - 3.8.0-1
 - Update to latest PCP sources.
 - Validate metric names passed into pmiAddMetric (BZ 958019)
diff --git a/sources b/sources
index 5147e49..c81fc2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e84224ad8ca40b7e207513180e717caf  pcp-3.8.0.src.tar.gz
+bc6db365a839c182754b8cb73d0faf34  pcp-3.8.1.src.tar.gz