[packages/pcp] - updated to 3.8.4 - updated opt patch - removed obsolete man patch
qboosh
qboosh at pld-linux.org
Sun Sep 15 16:57:19 CEST 2013
commit 59e1b8b3530c11325b45140b35a471c2eab7bb9d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Sep 15 16:57:30 2013 +0200
- updated to 3.8.4
- updated opt patch
- removed obsolete man patch
pcp-man.patch | 22 ----------------------
pcp-opt.patch | 8 ++++----
pcp.spec | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
3 files changed, 58 insertions(+), 32 deletions(-)
---
diff --git a/pcp.spec b/pcp.spec
index a32896f..5dafacd 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -7,22 +7,23 @@
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.8.2
-Release: 2
+Version: 3.8.4
+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: 47d1c1a6976aa6bb9dc3f38dd5bde4d0
+# Source0-md5: c7aad9eb224e30e61839941b9e3abf4d
Patch0: %{name}-ps.patch
Patch1: %{name}-opt.patch
Patch2: %{name}-nspr.patch
-Patch3: %{name}-man.patch
-Patch4: %{name}-saslconfdir.patch
+Patch3: %{name}-saslconfdir.patch
URL: http://oss.sgi.com/projects/pcp/
BuildRequires: autoconf >= 2.60
BuildRequires: bison
BuildRequires: cyrus-sasl-devel >= 2
BuildRequires: flex
+BuildRequires: libibmad-devel
+BuildRequires: libibumad-devel
BuildRequires: libmicrohttpd-devel >= 0.9.10
BuildRequires: nspr-devel >= 4
BuildRequires: nss-devel >= 3
@@ -30,11 +31,14 @@ BuildRequires: openssl-devel
BuildRequires: perl-ExtUtils-MakeMaker
BuildRequires: perl-base
BuildRequires: perl-tools-pod
+BuildRequires: pkgconfig
BuildRequires: python-devel
BuildRequires: readline-devel
BuildRequires: rpm-perlprov
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.219
+BuildRequires: systemd-devel
+BuildRequires: systemtap-sdt-devel
Requires: %{name}-libs = %{version}-%{release}
Requires: libmicrohttpd >= 0.9.10
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -126,13 +130,25 @@ bash-completion for PCP utilities.
%description -n bash-completion-pcp -l pl.UTF-8
Bashowe uzupełnianie nazw dla narzędzi PCP.
+%package -n systemtap-pcp
+Summary: systemtap/dtrace probes for PCP
+Summary(pl.UTF-8): Sondy systemtap/dtrace dla PCP
+Group: Development/Tools
+Requires: %{name} = %{version}-%{release}
+Requires: systemtap-client
+
+%description -n systemtap-pcp
+systemtap/dtrace probes for PCP.
+
+%description -n systemtap-pcp -l pl.UTF-8
+Sondy systemtap/dtrace dla PCP.
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%build
%{__autoconf}
@@ -417,6 +433,9 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
%dir /var/lib/pcp/config/pmlogconf/sqlserver
%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/sqlserver/summary
%dir /var/lib/pcp/config/pmlogconf/tools
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/atop
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/atop-proc
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/collectl
%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/iostat
%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/ip
%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/mpstat
@@ -425,6 +444,8 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/pmclient-summary
%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/pmieconf
%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/pmstat
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/sar
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/sar-summary
%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/tools/vmstat
%dir /var/lib/pcp/config/pmlogconf/v1.0
%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogconf/v1.0/C2
@@ -439,6 +460,7 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
%dir /var/lib/pcp/config/pmlogrewrite
%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/linux_proc_migrate.conf
%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/linux_proc_net_snmp_migrate.conf
+%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/linux_xfs_migrate.conf
%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/config/pmlogrewrite/mysql_migrate.conf
%dir /var/lib/pcp/pmdas
%dir /var/lib/pcp/pmdas/apache
@@ -490,6 +512,10 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
/var/lib/pcp/pmdas/gfs2/help
/var/lib/pcp/pmdas/gfs2/pmns
/var/lib/pcp/pmdas/gfs2/root
+%dir /var/lib/pcp/pmdas/gluster
+%attr(755,root,root) /var/lib/pcp/pmdas/gluster/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/gluster/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/gluster/pmdagluster.python
%dir /var/lib/pcp/pmdas/gpsd
%attr(755,root,root) /var/lib/pcp/pmdas/gpsd/Install
%attr(755,root,root) /var/lib/pcp/pmdas/gpsd/Remove
@@ -498,6 +524,15 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
%attr(755,root,root) /var/lib/pcp/pmdas/kvm/Install
%attr(755,root,root) /var/lib/pcp/pmdas/kvm/Remove
%attr(755,root,root) /var/lib/pcp/pmdas/kvm/pmdakvm.pl
+/var/lib/pcp/pmdas/ib
+%dir /var/lib/pcp/pmdas/infiniband
+%attr(755,root,root) /var/lib/pcp/pmdas/infiniband/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/infiniband/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/infiniband/pmdaib
+/var/lib/pcp/pmdas/infiniband/domain.h
+/var/lib/pcp/pmdas/infiniband/help
+/var/lib/pcp/pmdas/infiniband/pmns
+/var/lib/pcp/pmdas/infiniband/root
%dir /var/lib/pcp/pmdas/linux
%attr(755,root,root) /var/lib/pcp/pmdas/linux/pmdalinux
%attr(755,root,root) /var/lib/pcp/pmdas/linux/pmda_linux.so
@@ -756,6 +791,13 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
/var/lib/pcp/pmdas/weblog/help
/var/lib/pcp/pmdas/weblog/pmns
/var/lib/pcp/pmdas/weblog/root
+%dir /var/lib/pcp/pmdas/xfs
+%attr(755,root,root) /var/lib/pcp/pmdas/xfs/pmda_xfs.so
+%attr(755,root,root) /var/lib/pcp/pmdas/xfs/pmdaxfs
+/var/lib/pcp/pmdas/xfs/domain.h
+/var/lib/pcp/pmdas/xfs/help
+/var/lib/pcp/pmdas/xfs/help.dir
+/var/lib/pcp/pmdas/xfs/help.pag
%dir /var/lib/pcp/pmdas/zimbra
%attr(755,root,root) /var/lib/pcp/pmdas/zimbra/Install
%attr(755,root,root) /var/lib/pcp/pmdas/zimbra/Remove
@@ -787,6 +829,7 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
%{_mandir}/man1/pmdagfs2.1*
%{_mandir}/man1/pmdagluster.1*
%{_mandir}/man1/pmdagpsd.1*
+%{_mandir}/man1/pmdaib.1*
%{_mandir}/man1/pmdakvm.1*
%{_mandir}/man1/pmdamailq.1*
%{_mandir}/man1/pmdamemcache.1*
@@ -888,6 +931,7 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
/var/lib/pcp/pmns/root_mmv
/var/lib/pcp/pmns/root_pmcd
/var/lib/pcp/pmns/root_proc
+/var/lib/pcp/pmns/root_xfs
/var/lib/pcp/pmns/stdpmid.pcp
%config(noreplace) %verify(not md5 mtime size) /var/lib/pcp/pmns/stdpmid.local
%ghost /var/lib/pcp/pmns/stdpmid
@@ -968,3 +1012,7 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
%files -n bash-completion-pcp
%defattr(644,root,root,755)
/etc/bash_completion.d/pcp
+
+%files -n systemtap-pcp
+%defattr(644,root,root,755)
+%{_datadir}/systemtap/tapset/pmcd.stp
diff --git a/pcp-man.patch b/pcp-man.patch
deleted file mode 100644
index 20861c3..0000000
--- a/pcp-man.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- pcp-3.8.2/man/man1/pmdagfs2.1.orig 2013-07-18 02:29:18.000000000 +0200
-+++ pcp-3.8.2/man/man1/pmdagfs2.1 2013-08-25 21:49:14.945888103 +0200
-@@ -15,7 +15,7 @@
- .\"
- .TH PMDAGFS2 1 "PCP" "Performance Co-Pilot"
- .SH NAME
--\fBpmdagfs2\fR \- Global Filesystem v2 (GFS2) PMDA
-+\f3pmdagfs2\f1 \- Global Filesystem v2 (GFS2) PMDA
- .SH DESCRIPTION
- .B pmdagfs2
- is a Performance Metrics Domain Agent (PMDA) which exports
---- pcp-3.8.2/man/man1/pmdagluster.1.orig 2013-07-24 09:38:40.000000000 +0200
-+++ pcp-3.8.2/man/man1/pmdagluster.1 2013-08-25 21:49:37.085887174 +0200
-@@ -15,7 +15,7 @@
- .\"
- .TH PMDAGLUSTER 1 "PCP" "Performance Co-Pilot"
- .SH NAME
--\fBpmdagluster\fR \- Gluster Filesystem PMDA
-+\f3pmdagluster\f1 \- Gluster Filesystem PMDA
- .SH DESCRIPTION
- \fBpmdagluster\fR is a Performance Metrics Domain Agent (PMDA) which exports
- metric values about mounted gluster filesystems using the
diff --git a/pcp-opt.patch b/pcp-opt.patch
index 42ab11f..cbd8a74 100644
--- a/pcp-opt.patch
+++ b/pcp-opt.patch
@@ -1,10 +1,10 @@
---- pcp-3.6.10/configure.in.orig 2012-12-22 15:49:53.253378178 +0100
-+++ pcp-3.6.10/configure.in 2012-12-22 16:14:15.650014365 +0100
-@@ -92,7 +92,7 @@
+--- 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
+@@ -127,7 +127,7 @@
test -f /etc/slackware-version && target_distro=slackware
test -f /etc/gentoo-release && target_distro=gentoo
test -f /etc/mandriva-release && target_distro=mandriva
-- export CFLAGS="-fpic -fno-strict-aliasing -D_GNU_SOURCE"
+- export CFLAGS="-fPIC -fno-strict-aliasing -D_GNU_SOURCE"
+ export CFLAGS="$CFLAGS -fPIC -fno-strict-aliasing -D_GNU_SOURCE"
elif test $target_os = darwin
then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pcp.git/commitdiff/59e1b8b3530c11325b45140b35a471c2eab7bb9d
More information about the pld-cvs-commit
mailing list