Merge branch 'master' into el5

pcp.spec

@@ -3,7 +3,7 @@ Name: pcp
 Version: 3.6.6
 %define buildversion 1
 
-Release: %{buildversion}%{?dist}
+Release: %{buildversion}%{?dist}.1
 License: GPLv2
 URL: http://oss.sgi.com/projects/pcp
 Group: Applications/System
@@ -197,12 +197,12 @@ building Performance Metric API (PMAPI) tools using Python.
 
 %prep
 %setup -q
-%configure --with-rcdir=/etc/rc.d/init.d
 
 %clean
 rm -Rf $RPM_BUILD_ROOT
 
 %build
+%configure --with-rcdir=/etc/rc.d/init.d
 make default_pcp
 
 %install
@@ -385,6 +385,9 @@ fi
 %defattr(-,root,root)
 
 %changelog
+* Wed Sep 05 2012 Nathan Scott <nathans@redhat.com> - 3.6.6-1.1
+- Move configure step from prep to build section of spec (BZ 854128)
+
 * Tue Aug 28 2012 Mark Goodwin <mgoodwin@redhat.com> - 3.6.6-1
 - Update to latest PCP sources, see installed CHANGELOG for details.
 - Introduces new python-pcp and pcp-testsuite sub-packages.

pcp_configure_s390x.patch

@@ -1,12 +0,0 @@
-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.

sources

@@ -1,2 +1 @@
-2de8ed0061eacb26fdf84706448b00af  pcp-3.6.6-1.src.tar.gz
-33d3bf9715f0c0493127aa4781a01405  pcp.spec
+16c0d16db8749b44c8c0fee1dceaa6ab  pcp-3.6.6-1.src.tar.gz