From fd5f385f5eeed28d0b36d66874f007d81fa3a8c7 Mon Sep 17 00:00:00 2001
From: Mark Goodwin <mgoodwin@redhat.com>
Date: Wed, 2 May 2012 22:11:27 +1000
Subject: [PATCH] Update to 3.6.3-1

---
 .gitignore |  1 +
 pcp.spec   | 42 +++++++++++++++++++++++++++---------------
 sources    |  4 +---
 3 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 13afe42..d6ff3db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ pcp-3.3.3-1.src.tar.gz
 /pcp.spec
 /pcp_configure_ppc64.patch
 /pcp-3.5.11-2.src.tar.gz
+/pcp-3.6.3-1.src.tar.gz
diff --git a/pcp.spec b/pcp.spec
index ae402fd..a57ee52 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,9 +1,9 @@
 Summary: System-level performance monitoring and performance management
 Name: pcp
-Version: 3.5.11
-%define buildversion 2
+Version: 3.6.3
+%define buildversion 1
 
-Release: %{buildversion}%{?dist}.1
+Release: %{buildversion}%{?dist}
 License: GPLv2
 URL: http://oss.sgi.com/projects/pcp
 Group: Applications/System
@@ -17,8 +17,6 @@ BuildRequires: initscripts
 Requires: bash gawk sed grep fileutils findutils initscripts
 Requires: pcp-libs = %{version}
 
-Patch0: pcp_configure_ppc64.patch
-
 %define _pmdasdir %{_localstatedir}/lib/pcp/pmdas
 
 %description
@@ -181,12 +179,8 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
 
 %prep
 %setup -q
-%patch0 -p1
 autoconf
-
-# The standard 'configure' macro should be used here, but configure.in
-# needs some tweaks before that will work correctly (TODO).
-./configure --libdir=%{_libdir} --libexecdir=%{_libexecdir}
+%configure
 
 %clean
 rm -Rf $RPM_BUILD_ROOT
@@ -226,18 +220,24 @@ then
     #
     # Stop daemons before erasing the package
     #
-    /sbin/service pcp stop >/dev/null 2>&1
+    /sbin/service pmlogger stop >/dev/null 2>&1
     /sbin/service pmie stop >/dev/null 2>&1
     /sbin/service pmproxy stop >/dev/null 2>&1
+    /sbin/service pcp stop >/dev/null 2>&1
+    /sbin/service pmcd stop >/dev/null 2>&1
 
     /sbin/chkconfig --del pcp >/dev/null 2>&1
+    /sbin/chkconfig --del pmcd >/dev/null 2>&1
+    /sbin/chkconfig --del pmlogger >/dev/null 2>&1
     /sbin/chkconfig --del pmie >/dev/null 2>&1
     /sbin/chkconfig --del pmproxy >/dev/null 2>&1
 fi
 
 %post
-/sbin/chkconfig --add pcp >/dev/null 2>&1
-/sbin/service pcp condrestart
+/sbin/chkconfig --add pmcd >/dev/null 2>&1
+/sbin/service pmcd condrestart
+/sbin/chkconfig --add pmlogger >/dev/null 2>&1
+/sbin/service pmlogger condrestart
 /sbin/chkconfig --add pmie >/dev/null 2>&1
 /sbin/service pmie condrestart
 /sbin/chkconfig --add pmproxy >/dev/null 2>&1
@@ -266,6 +266,8 @@ fi
 %{_localstatedir}/log/pcp
 %{_localstatedir}/lib/pcp/pmns
 %{_initrddir}/pcp
+%{_initrddir}/pmcd
+%{_initrddir}/pmlogger
 %{_initrddir}/pmie
 %{_initrddir}/pmproxy
 %{_mandir}/man4/*
@@ -354,8 +356,18 @@ fi
 %defattr(-,root,root)
 
 %changelog
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.11-2.1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Mon Apr 30 2012 Mark Goodwin - 3.6.3-1
+- Update to latest PCP sources
+
+* Thu Apr 26 2012 Mark Goodwin - 3.6.2-1
+- Update to latest PCP sources
+
+* Thu Apr 12 2012 Mark Goodwin - 3.6.1-1
+- Update to latest PCP sources
+
+* Thu Mar 22 2012 Mark Goodwin - 3.6.0-1
+- use %configure macro for correct libdir logic
+- update to latest PCP sources
 
 * Thu Dec 15 2011 Mark Goodwin - 3.5.11-2
 - patched configure.in for libdir=/usr/lib64 on ppc64
diff --git a/sources b/sources
index c2311e8..b7e4937 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-85b8c4161befe31f2ebc966c3f2b91a2  pcp.spec
-61d6cfe28eb9061ba66f5df924a692c4  pcp_configure_ppc64.patch
-984e2e26fe8c79f0bd0bf4ce70caf919  pcp-3.5.11-2.src.tar.gz
+1414fb9cd0a7cc2fdca655d0dabb646a  pcp-3.6.3-1.src.tar.gz