From d0f4a703f091bc719874e1f95fb8560d1040102e Mon Sep 17 00:00:00 2001 From: Mark Goodwin Date: Wed, 16 Jul 2014 13:53:30 +1000 Subject: [PATCH] Update to latest community sources --- .gitignore | 1 + pcp.spec | 10 +++++++++- sources | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 567801e..a6f4794 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ pcp-3.3.3-1.src.tar.gz /pcp-3.9.3.src.tar.gz /pcp-3.9.4.src.tar.gz /pcp-3.9.5.src.tar.gz +/pcp-3.9.7.src.tar.gz diff --git a/pcp.spec b/pcp.spec index 0cc6ec8..c5249b9 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,6 +1,6 @@ Summary: System-level performance monitoring and performance management Name: pcp -Version: 3.9.5 +Version: 3.9.7 %define buildversion 1 Release: %{buildversion}%{?dist} @@ -55,6 +55,7 @@ Requires: pcp-libs = %{version}-%{release} Requires: python-pcp = %{version}-%{release} Requires: perl-PCP-PMDA = %{version}-%{release} Obsoletes: pcp-gui-debuginfo +Obsoletes: pcp-pmda-nvidia %global tapsetdir %{_datadir}/systemtap/tapset @@ -388,7 +389,9 @@ monitoring systems using live and archived Performance Co-Pilot # %package -n pcp-doc Group: Documentation +%if 0%{?rhel} == 0 || 0%{?rhel} > 5 BuildArch: noarch +%endif Summary: Documentation and tutorial for the Performance Co-Pilot URL: http://www.performancecopilot.org @@ -474,10 +477,12 @@ ls -1 $RPM_BUILD_ROOT/%{_booksdir} |\ sed -e 's#^#'%{_booksdir}'\/#' > pcp-doc.list ls -1 $RPM_BUILD_ROOT/%{_datadir}/pcp/demos/tutorials |\ sed -e 's#^#'%{_datadir}/pcp/demos/tutorials'\/#' >>pcp-doc.list +%if !%{disable_qt} ls -1 $RPM_BUILD_ROOT/%{_pixmapdir} |\ sed -e 's#^#'%{_pixmapdir}'\/#' > pcp-gui.list cat base_bin.list base_exec.list base_man.list |\ egrep "$PCP_GUI" >> pcp-gui.list +%endif cat base_pmdas.list base_bin.list base_exec.list base_man.list |\ egrep -v 'pmdaib|pmmgr|pmweb|2pcp' |\ egrep -v "$PCP_GUI|pixmaps|pcp-doc|tutorials" |\ @@ -833,6 +838,9 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %defattr(-,root,root,-) %changelog +* Wed Jul 16 2014 Mark Goodwin - 3.9.7-1 +- Update to latest PCP sources. + * Wed Jun 18 2014 Dave Brolley - 3.9.5-1 - Daemon signal handlers no longer use unsafe APIs (BZ 847343) - Handle /var/run setups on a temporary filesystem (BZ 656659) diff --git a/sources b/sources index e7b5570..1a14987 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -963efc3538847dcf7535aac820f9b5e5 pcp-3.9.5.src.tar.gz +a71e731a319efba1f6f8f995de853c60 pcp-3.9.7.src.tar.gz