[pcp/el5: 2/2] Merge branch 'master' into el5

[nathans]

commit dde4a36d3bb2f679b69a7415b892d46b078f362e
Merge: ce2de42 823babf
Author: Nathan Scott <nathans at redhat.com>
Date:   Fri Oct 18 09:56:05 2013 +1100

    Merge branch 'master' into el5

 .gitignore |    1 +
 pcp.spec   |   87 ++++++++++++++++++++++++++++++++++++++++--------------------
 sources    |    2 +-
 3 files changed, 60 insertions(+), 30 deletions(-)
---
diff --cc pcp.spec
index 60e712d,56b1cab..db09cad
--- a/pcp.spec
+++ b/pcp.spec
@@@ -17,11 -17,9 +17,11 @@@ BuildRequires: ncurses-deve
  BuildRequires: readline-devel
  BuildRequires: cyrus-sasl-devel
  BuildRequires: libmicrohttpd-devel
 +%ifnarch ppc ppc64
  BuildRequires: systemtap-sdt-devel
 +%endif
  BuildRequires: perl(ExtUtils::MakeMaker)
- BuildRequires: initscripts man /bin/hostname
+ BuildRequires: initscripts man
  %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
  BuildRequires: systemd-devel
  %endif