diff --git a/.gitignore b/.gitignore index 824e6e9..a446d98 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ pcp-3.3.3-1.src.tar.gz /pcp-3.10.3-0.508.g8090873.tar.gz /pcp-3.10.3-0.620.g89545ba.tar.gz /pcp-3.10.3.src.tar.gz +/pcp-3.10.3-0.750.g326298d.tar.gz diff --git a/pcp.spec b/pcp.spec index 2172598..61e1d28 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,13 +1,13 @@ Summary: System-level performance monitoring and performance management Name: pcp Version: 3.10.3 -%define buildversion 2 +%define buildversion 1 -Release: %{buildversion}%{?dist} +Release: 0.750.g326298d%{?dist} License: GPLv2+ and LGPLv2.1+ and CC-BY URL: http://www.pcp.io Group: Applications/System -Source0: ftp://ftp.pcp.io/projects/pcp/download/%{name}-%{version}.src.tar.gz +Source0: %{name}-%{version}-0.750.g326298d.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 @@ -39,8 +39,8 @@ Source1: ftp://ftp.pcp.io/projects/pcp/download/pcp-webjs.src.tar.gz # 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 +# Do we wish to mandate python3 use in pcp? (f22+ and el8+) +%if 0%{?fedora} >= 22 || 0%{?rhel} > 7 %define default_python3 1 %else %define default_python3 0 @@ -65,14 +65,6 @@ 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 @@ -92,6 +84,13 @@ 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 @@ -1112,6 +1111,10 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %defattr(-,root,root,-) %changelog +* Mon Mar 09 2015 Lukas Berk - 3.10.3-0.750.g326298d +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Wed Mar 04 2015 Dave Brolley - 3.10.3-2 - papi 5.4.1 rebuild diff --git a/sources b/sources index c3bd150..e5d9745 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a044bc0b5014cbc4e3ef1c94682bef5f pcp-3.10.3.src.tar.gz -819a7f8788022f329b19f93b9c17fb1d pcp-webjs.src.tar.gz +bc01b808635ae9e0c3dbc360caa51f7a pcp-3.10.3-0.750.g326298d.tar.gz +34e17878db46a01bc39811c52e04d6eb pcp-webjs.src.tar.gz