[pcp/el5] New sources for PCP release 3.10.3

Mon Mar 2 22:33:37 UTC 2015

commit 2f30c196ef1b84ec9eb5cc6a004a9227447dd88e
Author: Dave Brolley <brolley at redhat.com>
Date:   Mon Mar 2 17:34:18 2015 -0500

    New sources for PCP release 3.10.3

 .gitignore |   1 +
 pcp.spec   | 114 +++++++++++++++++++++++++++++++++++--------------------------
 sources    |   2 +-
 3 files changed, 67 insertions(+), 50 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index e945b93..ef12ecf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ pcp-3.3.3-1.src.tar.gz
 /pcp-3.10.2-0.305.g64a0d4b.tar.gz
 /pcp-3.10.2-0.309.g3c90ff9.tar.gz
 /pcp-3.10.2.src.tar.gz
+/pcp-3.10.3.src.tar.gz
diff --git a/pcp.spec b/pcp.spec
index ec9a6b8..4341661 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,16 +1,14 @@
 Summary: System-level performance monitoring and performance management
 Name: pcp
-Version: 3.10.2
-%define buildversion 2
+Version: 3.10.3
+%define buildversion 1
 
 Release: %{buildversion}%{?dist}
 License: GPLv2+ and LGPLv2.1+ and CC-BY
 URL: http://www.pcp.io
 Group: Applications/System
-Source0: ftp://oss.sgi.com/projects/pcp/download/%{name}-%{version}.src.tar.gz
-Source1: ftp://oss.sgi.com/projects/pcp/download/pcp-webjs.src.tar.gz
-patch0: pcp.3.10.2.el5.python-1.patch
-patch1: pcp.3.10.2.el5.python-2.patch
+Source0: ftp://ftp.pcp.io/projects/pcp/download/%{name}-%{version}.src.tar.gz
+Source1: ftp://ftp.pcp.io/projects/pcp/download/pcp-webjs.src.tar.gz
 
 # There are no papi/libpfm devel packages for s390 nor for some rhels, disable
 %ifarch s390 s390x
@@ -29,18 +27,9 @@ patch1: pcp.3.10.2.el5.python-2.patch
 %endif
 %endif
 
-# https://bugzilla.redhat.com/show_bug.cgi?id=1169226
-%if 0%{?rhel} == 0 || 0%{?rhel} >= 5
 %define disable_microhttpd 0
-%else
-%define disable_microhttpd 1
-%endif
-# Cairo headers on el5 incompatible with graphite code
-%if 0%{?rhel} == 0 || 0%{?rhel} > 5
 %define disable_cairo 0
-%else
-%define disable_cairo 1
-%endif
+
 # Python development environment before el6 is pre-2.6 (too old)
 %if 0%{?rhel} == 0 || 0%{?rhel} > 5
 %define disable_python2 0
@@ -50,9 +39,18 @@ patch1: pcp.3.10.2.el5.python-2.patch
 # No python3 development environment before el7
 %if 0%{?rhel} == 0 || 0%{?rhel} > 6
 %define disable_python3 0
+# Do we wish to mandate python3 use in pcp?  (f23+ and el8+)
+%if 0%{?fedora} >= 23 || 0%{?rhel} > 7
+%define default_python3 1
+%else
+%define default_python3 0
+%define
+%endif
 %else
 %define disable_python3 1
+%define default_python3 0
 %endif
+
 # Qt development and runtime environment missing components before el6
 %if 0%{?rhel} == 0 || 0%{?rhel} > 5
 %define disable_qt 0
@@ -67,6 +65,14 @@ BuildRequires: rpm-devel
 BuildRequires: avahi-devel
 %if !%{disable_python2}
 BuildRequires: python-devel
+# systemtap dtrace utility requires python2, so only use it if we can
+%if 0%{?rhel} == 0 || 0%{?rhel} > 5
+BuildRequires: systemtap-sdt-devel
+%else
+%ifnarch ppc ppc64
+BuildRequires: systemtap-sdt-devel
+%endif
+%endif
 %endif
 %if !%{disable_python3}
 BuildRequires: python3-devel
@@ -86,13 +92,6 @@ BuildRequires: libmicrohttpd-devel
 %if !%{disable_cairo}
 BuildRequires: cairo-devel
 %endif
-%if 0%{?rhel} == 0 || 0%{?rhel} > 5
-BuildRequires: systemtap-sdt-devel
-%else
-%ifnarch ppc ppc64
-BuildRequires: systemtap-sdt-devel
-%endif
-%endif
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: initscripts man
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
@@ -104,7 +103,7 @@ BuildRequires: qt4-devel >= 4.4
 %endif
 
 Requires: bash gawk sed grep fileutils findutils initscripts perl which
-%if !%{disable_python2}
+%if !%{disable_python2} && !%{default_python3}
 %if 0%{?rhel} <= 5
 Requires: python-ctypes
 %endif
@@ -112,7 +111,10 @@ Requires: python
 %endif
 
 Requires: pcp-libs = %{version}-%{release}
-%if !%{disable_python2}
+%if %{default_python3}
+Requires: python3-pcp = %{version}-%{release}
+%endif
+%if !%{disable_python2} && !%{default_python3}
 Requires: python-pcp = %{version}-%{release}
 %endif
 Requires: perl-PCP-PMDA = %{version}-%{release}
@@ -402,6 +404,21 @@ Performance Co-Pilot (PCP) front-end tools for importing MTRG data
 into standard PCP archive logs for replay with any PCP monitoring tool.
 
 #
+# pcp-import-ganglia2pcp
+#
+%package import-ganglia2pcp
+License: LGPLv2+
+Group: Applications/System
+Summary: Performance Co-Pilot tools for importing ganglia data into PCP archive logs
+URL: http://www.pcp.io
+Requires: pcp-libs = %{version}-%{release}
+Requires: perl-PCP-LogImport = %{version}-%{release}
+
+%description import-ganglia2pcp
+Performance Co-Pilot (PCP) front-end tools for importing ganglia data
+into standard PCP archive logs for replay with any PCP monitoring tool.
+
+#
 # pcp-import-collectl2pcp
 #
 %package import-collectl2pcp
@@ -547,8 +564,6 @@ PCP utilities and daemons, and the PCP graphical tools.
 %prep
 %setup -q
 %setup -q -T -D -a 1
-%patch0 -p1
-%patch1 -p1
 
 %clean
 rm -Rf $RPM_BUILD_ROOT
@@ -611,6 +626,13 @@ for f in $RPM_BUILD_ROOT/%{_initddir}/{pcp,pmcd,pmlogger,pmie,pmwebd,pmmgr,pmpro
 	sed -i -e '/^# chkconfig/s/:.*$/: - 95 05/' -e '/^# Default-Start:/s/:.*$/:/' $f
 done
 
+%if %{default_python3}
+# defaulting to python3 requires /usr/bin/python3 hashbang lines, make it so
+for f in `find $RPM_BUILD_ROOT -type f -print`; do
+	sed -i -e "1 s|^#!/usr/bin/python\b|#!/usr/bin/python3|" $f
+done
+%endif
+
 # list of PMDAs in the base pkg
 ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
   grep -E -v 'simple|sample|trivial|txmon' |\
@@ -1017,6 +1039,11 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
 %{_bindir}/mrtg2pcp
 %{_mandir}/man1/mrtg2pcp.1.gz
 
+%files import-ganglia2pcp
+%defattr(-,root,root)
+%{_bindir}/ganglia2pcp
+%{_mandir}/man1/ganglia2pcp.1.gz
+
 %files import-collectl2pcp
 %defattr(-,root,root)
 %{_bindir}/collectl2pcp
@@ -1085,8 +1112,17 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
 %defattr(-,root,root,-)
 
 %changelog
-* Wed Feb 04 2015 Dave Brolley <brolley at redhat.com> - 3.10.2-2
-- Resolve python-pcp dependency
+* Mon Mar 02 2015 Dave Brolley <brolley at redhat.com> - 3.10.3-1
+- Update to latest PCP sources.
+- New sub-package for pcp-import-ganglia2pcp.
+- Python3 support, enabled by default in f22 onward (BZ 1194324)
+
+* Mon Feb 23 2015 Slavek Kabrda <bkabrda at redhat.com> - 3.10.2-3
+- Only use Python 3 in Fedora >= 23, more info at
+  https://bugzilla.redhat.com/show_bug.cgi?id=1194324#c4
+
+* Mon Feb 23 2015 Nathan Scott <nathans at redhat.com> - 3.10.2-2
+- Initial changes to support python3 as default (BZ 1194324)
 
 * Fri Jan 23 2015 Dave Brolley <brolley at redhat.com> - 3.10.2-1
 - Update to latest PCP sources.
@@ -1095,26 +1131,6 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild"
 - Correct units for cgroup memory metrics (BZ 1180351)
 - Add the pcp2graphite(1) export script (BZ 1163986)
 
-* Mon Jan 19 2015 Lukas Berk <lberk at redhat.com> - 3.10.2-0.309.g3c90ff9
-- Automated weekly rawhide release
-
-* Mon Jan 12 2015 Lukas Berk <lberk at redhat.com> - 3.10.2-0.305.g64a0d4b
-- Automated weekly rawhide release
-
-* Mon Jan 05 2015 Lukas Berk <lberk at redhat.com> - 3.10.2-0.292.g764a0fb
-- Automated weekly rawhide release
-
-* Mon Dec 22 2014 Lukas Berk <lberk at redhat.com> - 3.10.2-0.222.g77dcbbf
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Mon Dec 15 2014 Lukas Berk <lberk at redhat.com> - 3.10.2-0.124.g1e0c939
-- Automated weekly rawhide release
-
-* Mon Dec 08 2014 Lukas Berk <lberk at redhat.com> - 3.10.2-0.21.g6bad98e
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
 * Mon Dec 01 2014 Nathan Scott <nathans at redhat.com> - 3.10.1-1
 - New conditionally-built pcp-pmda-perfevent sub-package.
 - Update to latest PCP sources.
diff --git a/sources b/sources
index 1bd3306..c3bd150 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e76964d6945187513e8c34dd492811bd  pcp-3.10.2.src.tar.gz
+a044bc0b5014cbc4e3ef1c94682bef5f  pcp-3.10.3.src.tar.gz
 819a7f8788022f329b19f93b9c17fb1d  pcp-webjs.src.tar.gz
