Merge branch 'master' into el4

pcp.spec

@@ -3,11 +3,13 @@ Name: pcp
 Version: 3.6.3
 %define buildversion 1
 
-Release: %{buildversion}%{?dist}
+Release: %{buildversion}%{?dist}.2
 License: GPLv2
 URL: http://oss.sgi.com/projects/pcp
 Group: Applications/System
 Source0: ftp://oss.sgi.com/projects/pcp/download/pcp-%{version}-%{buildversion}.src.tar.gz
+# recognize s390x as 64-bit arch
+Patch0: pcp_configure_s390x.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: procps autoconf bison flex ncurses-devel readline-devel
@@ -149,20 +151,6 @@ Requires: pcp-libs >= %{version} perl-PCP-LogImport >= %{version} sysstat
 Performance Co-Pilot (PCP) front-end tools for importing iostat data
 into standard PCP archive logs for replay with any PCP monitoring tool.
 
-#
-# pcp-import-sheet2pcp
-#
-%package import-sheet2pcp
-License: LGPLv2+
-Group: Applications/System
-Summary: Performance Co-Pilot tools for importing spreadsheet data into PCP archive logs
-URL: http://oss.sgi.com/projects/pcp/
-Requires: pcp-libs >= %{version} perl-PCP-LogImport >= %{version} sysstat
-
-%description import-sheet2pcp
-Performance Co-Pilot (PCP) front-end tools for importing spreadsheet data
-into standard PCP archive logs for replay with any PCP monitoring tool.
-
 #
 # pcp-import-mrtg2pcp
 #
@@ -179,6 +167,7 @@ into standard PCP archive logs for replay with any PCP monitoring tool.
 
 %prep
 %setup -q
+%patch0 -p1 -b .s390x
 autoconf
 %configure
 
@@ -197,6 +186,9 @@ make install_pcp
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/pcp
 
+# remove sheet2pcp until BZ 830923 and BZ 754678 are resolved.
+rm -f $RPM_BUILD_ROOT/%{_bindir}/sheet2pcp $RPM_BUILD_ROOT/%{_mandir}/man1/sheet2pcp.1.gz
+
 # default chkconfig off for Fedora and RHEL
 for f in $RPM_BUILD_ROOT/%{_sysconfdir}/rc.d/init.d/{pcp,pmie,pmproxy}; do
 	sed -i -e '/^# chkconfig/s/:.*$/: - 95 05/' -e '/^# Default-Start:/s/:.*$/:/' $f
@@ -333,11 +325,6 @@ fi
 %{_bindir}/iostat2pcp
 %{_mandir}/man1/iostat2pcp.1.gz
 
-%files import-sheet2pcp
-%defattr(-,root,root)
-%{_bindir}/sheet2pcp
-%{_mandir}/man1/sheet2pcp.1.gz
-
 %files import-mrtg2pcp
 %defattr(-,root,root)
 %{_bindir}/mrtg2pcp
@@ -356,6 +343,12 @@ fi
 %defattr(-,root,root)
 
 %changelog
+* Thu Jun 21 2012 Mark Goodwin <mgoodwin@redhat.com>
+- remove pcp-import-sheet2pcp subpackage due to missing deps (BZ 830923) - 3.6.3-1.2
+
+* Fri May 18 2012 Dan Horák <dan[at]danny.cz> - 3.6.3-1.1
+- fix build on s390x
+
 * Mon Apr 30 2012 Mark Goodwin - 3.6.3-1
 - Update to latest PCP sources
 

pcp_configure_s390x.patch

@@ -0,0 +1,12 @@
+diff -up pcp-3.6.3/configure.in.s390x pcp-3.6.3/configure.in
+--- pcp-3.6.3/configure.in.s390x	2012-05-18 12:31:14.000000000 +0200
++++ pcp-3.6.3/configure.in	2012-05-18 12:31:47.000000000 +0200
+@@ -1636,7 +1636,7 @@ if test $target_os = mingw
+ then
+     pcp_lib_dir=/local/bin
+     pcp_lib32_dir=/local/bin
+-elif test $target_os = linux -a \( $target_cpu = x86_64 -o $target_cpu = powerpc64 \) -a $target_distro != debian
++elif test $target_os = linux -a \( $target_cpu = x86_64 -o $target_cpu = powerpc64 -o $target_cpu = s390x \) -a $target_distro != debian
+ then
+     # Linux on x86_64 and ppc64 puts libraries in .../lib64 (and rpmbuild
+     # enforces that convention) but $libdir lies about it.