rhel5 build fix, backporting upstream commit 23dfcd456

pcp.spec

@@ -1,7 +1,7 @@
 Summary: System-level performance monitoring and performance management
 Name: pcp
 Version: 3.9.1
-%define buildversion 1
+%define buildversion 2
 
 Release: %{buildversion}%{?dist}
 License: GPLv2+ and LGPLv2.1+
@@ -9,6 +9,8 @@ URL: http://oss.sgi.com/projects/pcp
 Group: Applications/System
 Source0: pcp-%{version}.src.tar.gz
 
+Patch0: statics.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: procps autoconf bison flex
 BuildRequires: nss-devel
@@ -340,6 +342,7 @@ building Performance Metric API (PMAPI) tools using Python.
 
 %prep
 %setup -q
+%patch0 -p1 
 
 %clean
 rm -Rf $RPM_BUILD_ROOT
@@ -718,6 +721,9 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
 %defattr(-,root,root)
 
 %changelog
+* Sun Mar 23 2014 Frank Ch. Eigler <fche@redhat.com> - 3.9.1-2
+- RHEL5 check-statics build fix
+
 * Wed Mar 19 2014 Nathan Scott <nathans@redhat.com> - 3.9.1-1
 - Update to latest PCP sources.
 

statics.patch

@@ -0,0 +1,22 @@
+commit 23dfcd45668d2076dfceeeb96d80a42b06240fe6
+Author: Nathan Scott <nathans@redhat.com>
+Date:   Thu Mar 20 14:05:30 2014 +1100
+
+    Fix build on RHEL5 i386 where libpcp has unexpected statics
+    
+    $ ./check-statics
+    rtime.o: d startend_relative_terms.9369 : Error: additional symbol
+
+diff --git a/src/libpcp/src/check-statics b/src/libpcp/src/check-statics
+index 086167786965..7f04ee771e34 100755
+--- a/src/libpcp/src/check-statics
++++ b/src/libpcp/src/check-statics
+@@ -315,7 +315,7 @@ rtime.o
+     r ?ampm			# const (MinGW)
+     r ?months			# const (MinGW)
+     r ?wdays			# const (MinGW)
+-    s ?startend_relative_terms.[0-9]*	# const
++    [ds] ?startend_relative_terms.[0-9]*	# const
+ sortinst.o
+ spec.o
+ store.o