diff --git a/.gitignore b/.gitignore index e945b93..2ce0706 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-0.508.g8090873.tar.gz diff --git a/pcp.spec b/pcp.spec index 5b3c6bc..176a000 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,14 +1,14 @@ Summary: System-level performance monitoring and performance management Name: pcp -Version: 3.10.2 +Version: 3.10.3 %define buildversion 1 -Release: %{buildversion}%{?dist} +Release: 0.508.g8090873%{?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 +Source0: %{name}-%{version}-0.508.g8090873.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 @@ -27,18 +27,8 @@ Source1: ftp://oss.sgi.com/projects/pcp/download/pcp-webjs.src.tar.gz %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 @@ -102,13 +92,17 @@ BuildRequires: qt4-devel >= 4.4 %endif Requires: bash gawk sed grep fileutils findutils initscripts perl which -Requires: python +%if !%{disable_python2} %if 0%{?rhel} <= 5 Requires: python-ctypes %endif +Requires: python +%endif Requires: pcp-libs = %{version}-%{release} +%if !%{disable_python2} Requires: python-pcp = %{version}-%{release} +%endif Requires: perl-PCP-PMDA = %{version}-%{release} Obsoletes: pcp-gui-debuginfo Obsoletes: pcp-pmda-nvidia @@ -1077,6 +1071,10 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %defattr(-,root,root,-) %changelog +* Mon Feb 09 2015 Lukas Berk - 3.10.3-0.508.g8090873 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Fri Jan 23 2015 Dave Brolley - 3.10.2-1 - Update to latest PCP sources. - Improve pmdaInit diagnostics for DSO helptext (BZ 1182949) diff --git a/sources b/sources index 1bd3306..353ac0c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e76964d6945187513e8c34dd492811bd pcp-3.10.2.src.tar.gz -819a7f8788022f329b19f93b9c17fb1d pcp-webjs.src.tar.gz +ff79e08a9485a4b5894211dcb6c77a05 pcp-3.10.3-0.508.g8090873.tar.gz +34e17878db46a01bc39811c52e04d6eb pcp-webjs.src.tar.gz