Merge branch 'master' into el5

.gitignore

@@ -13,3 +13,4 @@ pcp-3.3.3-1.src.tar.gz
 /pcp-3.6.10.src.tar.gz
 /pcp-3.7.0.src.tar.gz
 /pcp-3.7.1.src.tar.gz
+/pcp-3.7.2.src.tar.gz

pcp.spec

@@ -1,7 +1,7 @@
 Summary: System-level performance monitoring and performance management
 Name: pcp
-Version: 3.7.1
-%define buildversion 2
+Version: 3.7.2
+%define buildversion 1
 
 Release: %{buildversion}%{?dist}
 License: GPLv2
@@ -28,8 +28,9 @@ Requires: python-pcp = %{version}-%{release}
 Requires: perl-PCP-PMDA = %{version}-%{release}
 
 %define _confdir  %{_sysconfdir}/pcp
-%define _logsdir  %{_localstatedir}/log/pcp
 %define _initddir %{_sysconfdir}/rc.d/init.d
+%define _logsdir  %{_localstatedir}/log/pcp
+%define _pmnsdir  %{_localstatedir}/lib/pcp/pmns
 %define _tempsdir %{_localstatedir}/lib/pcp/tmp
 %define _pmdasdir %{_localstatedir}/lib/pcp/pmdas
 %define _testsdir %{_localstatedir}/lib/pcp/testsuite
@@ -219,7 +220,6 @@ building Performance Metric API (PMAPI) tools using Python.
 rm -Rf $RPM_BUILD_ROOT
 
 %build
-autoconf
 %configure --with-rcdir=%{_initddir} --with-tmpdir=%{_tempsdir}
 make default_pcp
 
@@ -324,6 +324,7 @@ fi
 
 %post
 PCP_LOG_DIR=%{_logsdir}
+PCP_PMNS_DIR=%{_pmnsdir}
 # restore saved configs, if any
 test -s "$PCP_LOG_DIR/configs.sh" && source "$PCP_LOG_DIR/configs.sh"
 rm -f $PCP_LOG_DIR/configs.sh
@@ -343,7 +344,7 @@ migrate_tempdirs()
             source="$d/$f"
             target="$_new_tmp_dir/$_sub/$f"
             [ "$source" != "$target" ] || continue
-            mv -fun "$source" "$target"
+	    [ -f "$target" ] || mv -fu "$source" "$target"
         done
         cd && rmdir "$d" 2>/dev/null
     done
@@ -356,6 +357,8 @@ chown -R pcp:pcp %{_logsdir}/pmcd 2>/dev/null
 chown -R pcp:pcp %{_logsdir}/pmlogger 2>/dev/null
 chown -R pcp:pcp %{_logsdir}/pmie 2>/dev/null
 chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
+# we only need this manual Rebuild as long as pmcd is condstart below
+[ -f "$PCP_PMNS_DIR/root" ] || ( cd "$PCP_PMNS_DIR" && ./Rebuild -sud )
 /sbin/chkconfig --add pmcd >/dev/null 2>&1
 /sbin/service pmcd condrestart
 /sbin/chkconfig --add pmlogger >/dev/null 2>&1
@@ -485,8 +488,9 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
 %defattr(-,root,root)
 
 %changelog
-* Mon Mar 25 2013 Nathan Scott <nathans@redhat.com> - 3.7.1-2
-- Run autoconf before configure for latest scripts (BZ 926315).
+* Fri Apr 19 2013 Nathan Scott <nathans@redhat.com> - 3.7.2-1
+- Update to latest PCP sources.
+- Ensure root namespace exists at the end of install (BZ 952977)
 
 * Wed Mar 20 2013 Nathan Scott <nathans@redhat.com> - 3.7.1-1
 - Update to latest PCP sources.

sources

@@ -1 +1 @@
-7131aa83ecd9ab3a409ffacd41a3b43a  pcp-3.7.1.src.tar.gz
+4924f1230c4a4379bbc017e27c4e5b60  pcp-3.7.2.src.tar.gz