[pcp/el6: 2/2] Update to latest community sources

[Mark Goodwin]

commit 9b03e227d981a30d9a587fbf3eaa9921be21fcf2
Merge: 3232abe d0f4a70
Author: Mark Goodwin <mgoodwin at redhat.com>
Date:   Wed Jul 16 14:02:11 2014 +1000

    Update to latest community sources

 .gitignore |    1 +
 pcp.spec   |   14 +++++++++++++-
 sources    |    2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
---
diff --cc pcp.spec
index a881e01,c5249b9..9a5d020
--- a/pcp.spec
+++ b/pcp.spec
@@@ -388,6 -389,9 +389,12 @@@ monitoring systems using live and archi
  #
  %package -n pcp-doc
  Group: Documentation
++<<<<<<< HEAD
++=======
+ %if 0%{?rhel} == 0 || 0%{?rhel} > 5
+ BuildArch: noarch
+ %endif
++>>>>>>> master
  Summary: Documentation and tutorial for the Performance Co-Pilot
  URL: http://www.performancecopilot.org