- updated to 3.9.6

- updated patches

diff --git a/pcp-nspr.patch b/pcp-nspr.patch
index 6a07d49e275e0faaf588fd1447d99d7331bbaaf8..3b0131c7f0b768741718f69206d47d1aff6a68d6 100644 (file)
--- a/pcp-nspr.patch
+++ b/pcp-nspr.patch
@@ -1,5 +1,5 @@
---- pcp-3.8.0/configure.in.orig        2013-06-06 18:00:26.783021767 +0200
-+++ pcp-3.8.0/configure.in     2013-06-06 18:09:36.373010312 +0200
+--- pcp-3.9.6/configure.ac.orig        2013-06-06 18:00:26.783021767 +0200
++++ pcp-3.9.6/configure.ac     2013-06-06 18:09:36.373010312 +0200
 @@ -1979,7 +1979,7 @@
      AC_SUBST(lib_for_nss)
  

diff --git a/pcp-opt.patch b/pcp-opt.patch
index cbd8a7428d36e6fd5134622542079298a1f205d3..3fd1f233bcf79812c3d1b8ae4a22063eaa4b5186 100644 (file)
--- a/pcp-opt.patch
+++ b/pcp-opt.patch
@@ -1,5 +1,5 @@
---- pcp-3.8.4/configure.in.orig        2013-09-15 16:11:00.907263278 +0200
-+++ pcp-3.8.4/configure.in     2013-09-15 16:12:28.537259600 +0200
+--- pcp-3.9.6/configure.ac.orig        2013-09-15 16:11:00.907263278 +0200
++++ pcp-3.9.6/configure.ac     2013-09-15 16:12:28.537259600 +0200
 @@ -127,7 +127,7 @@
      test -f /etc/slackware-version && target_distro=slackware
      test -f /etc/gentoo-release && target_distro=gentoo

diff --git a/pcp-ps.patch b/pcp-ps.patch
index d6b2bfd6f8a3c4f1aa09302a3b4312cbe06f7a64..e2d0b3ee5cc35a62df22e8e2981b6bec179cb953 100644 (file)
--- a/pcp-ps.patch
+++ b/pcp-ps.patch
@@ -1,6 +1,6 @@
---- pcp-3.6.10/configure.in.orig       2012-11-19 00:47:34.000000000 +0100
-+++ pcp-3.6.10/configure.in    2012-12-16 19:50:49.390548609 +0100
-@@ -697,15 +697,7 @@
+--- pcp-3.9.6/configure.ac.orig        2014-06-19 19:02:57.625789139 +0200
++++ pcp-3.9.6/configure.ac     2014-06-19 19:06:56.395784163 +0200
+@@ -937,17 +937,7 @@
  NR == 1                       { if ($1 != "UID" && $1 != "USER") exit
                          if ($2 != "PID") exit
                        }
@@ -12,12 +12,14 @@
 -# Fedora 15
 -$2 == 1 && / \/bin\/systemd/ { print "OK"; exit }
 -# Fedora 17
--$2 == 1 && / \/usr\/lib\/systemd\/systemd/ { print "OK"; exit }'`
+-$2 == 1 && / \/usr\/lib\/systemd\/systemd/ { print "OK"; exit }
+-# Debian sid
+-$2 == 1 && / \/lib\/systemd\/systemd/ { print "OK"; exit }'`
 +$2 ~ /^[[0-9]]+$/ && /configure/      { print "OK"; exit }'`
-     if test "$ans" = OK
-     then
-       pcp_ps_have_bsd=false
-@@ -719,10 +711,7 @@
+       if test "$ans" = OK
+       then
+           pcp_ps_have_bsd=false
+@@ -962,10 +952,7 @@
  NR == 1                       { if ($1 != "UID" && $1 != "USER") exit
                          if ($2 != "PID") exit
                        }
@@ -26,6 +28,6 @@
 -$2 == 1 && / \/sbin\/launchd/ { print "OK"; exit }
 -$2 == 1 && / \/init/  { print "OK"; exit }'`
 +$2 ~ /^[[0-9]]+$/ && /configure/      { print "OK"; exit }'`
-     if test "$ans" = OK
-     then
-       pcp_ps_have_bsd=true
+       if test "$ans" = OK
+       then
+           pcp_ps_have_bsd=true

diff --git a/pcp-rpm.patch b/pcp-rpm.patch
index 82302473cc0c2cd6944d20841fc03010b7e8ed20..1730930e23345dd15034e3bb5f39bcbb039ec1e3 100644 (file)
--- a/pcp-rpm.patch
+++ b/pcp-rpm.patch
@@ -1,5 +1,5 @@
---- pcp-3.9.4/configure.in.orig        2014-05-28 22:05:42.575179206 +0200
-+++ pcp-3.9.4/configure.in     2014-05-30 20:21:36.818374363 +0200
+--- pcp-3.9.6/configure.ac.orig        2014-05-28 22:05:42.575179206 +0200
++++ pcp-3.9.6/configure.ac     2014-05-30 20:21:36.818374363 +0200
 @@ -2369,8 +2369,8 @@
  savedLIBS=$LIBS
  AC_MSG_CHECKING([for rpmlib > 4.4.2])

diff --git a/pcp-saslconfdir.patch b/pcp-saslconfdir.patch
index 235599740ffdd0e9a8e59ea3a8fafa740101d2da..7993584bdc2ff293ff6a8865a5545d584061817d 100644 (file)
--- a/pcp-saslconfdir.patch
+++ b/pcp-saslconfdir.patch
@@ -1,5 +1,5 @@
---- pcp-3.8.2/configure.in~    2013-08-28 21:02:12.078864396 +0200
-+++ pcp-3.8.2/configure.in     2013-08-28 21:04:27.163062319 +0200
+--- pcp-3.9.6/configure.ac~    2013-08-28 21:02:12.078864396 +0200
++++ pcp-3.9.6/configure.ac     2013-08-28 21:04:27.163062319 +0200
 @@ -1687,7 +1687,7 @@
  pcp_etc_dir=`eval echo $sysconfdir`
  pcp_etc_dir=`eval echo $pcp_etc_dir`

diff --git a/pcp.spec b/pcp.spec
index e4663582c55f9f4257ed5d96cb5f69a3f4250bf0..954001cd83ab0456cf160e3dec29a25b073f569d 100644 (file)
--- a/pcp.spec
+++ b/pcp.spec
@@ -10,12 +10,12 @@
 Summary:       Performance Co-Pilot - system level performance monitoring and management
 Summary(pl.UTF-8):     Performance Co-Pilot - monitorowanie i zarządzanie wydajnością na poziomie systemu
 Name:          pcp
-Version:       3.9.4
+Version:       3.9.6
 Release:       1
 License:       LGPL v2.1 (libraries), GPL v2 (the rest)
 Group:         Applications/System
 Source0:       ftp://oss.sgi.com/projects/pcp/download/%{name}-%{version}.src.tar.gz
-# Source0-md5: cd9b3ba20035d8ac603e97cdb9d67268
+# Source0-md5: cb8b4d280d9238555b0e1eae894e54f8
 Patch0:                %{name}-ps.patch
 Patch1:                %{name}-opt.patch
 Patch2:                %{name}-nspr.patch
@@ -280,7 +280,6 @@ fi
 %attr(755,root,root) %{_bindir}/pmatop
 %attr(755,root,root) %{_bindir}/pmclient
 %attr(755,root,root) %{_bindir}/pmcollectl
-%attr(755,root,root) %{_bindir}/pmconfig
 %attr(755,root,root) %{_bindir}/pmdate
 %attr(755,root,root) %{_bindir}/pmdbg
 %attr(755,root,root) %{_bindir}/pmdumplog
@@ -315,6 +314,7 @@ fi
 %attr(755,root,root) %{_libdir}/pcp/bin/pcp-uptime
 %attr(755,root,root) %{_libdir}/pcp/bin/pmcd
 %attr(755,root,root) %{_libdir}/pcp/bin/pmcd_wait
+%attr(755,root,root) %{_libdir}/pcp/bin/pmconfig
 %attr(755,root,root) %{_libdir}/pcp/bin/pmgetopt
 %attr(755,root,root) %{_libdir}/pcp/bin/pmhostname
 %attr(755,root,root) %{_libdir}/pcp/bin/pmie_check
@@ -847,6 +847,7 @@ fi
 %doc /var/lib/pcp/pmdas/systemd/README
 %attr(755,root,root) /var/lib/pcp/pmdas/systemd/Install
 %attr(755,root,root) /var/lib/pcp/pmdas/systemd/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/systemd/pmdasystemd
 /var/lib/pcp/pmdas/systemd/domain.h
 /var/lib/pcp/pmdas/systemd/help
 /var/lib/pcp/pmdas/systemd/pmns
@@ -1096,6 +1097,7 @@ fi
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Sockets
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Swap
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/Syscalls
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmchart/vCPU
 %dir /var/lib/pcp/config/pmsnap
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmsnap/Snap
 %config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmsnap/crontab