diff --git a/.gitignore b/.gitignore index 268948c..bf3eae1 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ pcp-3.3.3-1.src.tar.gz /pcp-3.10.5-0.20150601git9478ca0.tar.gz /pcp-3.10.5.src.tar.gz /pcp-3.10.6-0.20150713git9c4f78f.tar.gz +/pcp-3.10.6-0.20150727gitb37d11d.tar.gz diff --git a/pcp.spec b/pcp.spec index 0deabbe..09caae1 100644 --- a/pcp.spec +++ b/pcp.spec @@ -3,11 +3,11 @@ Name: pcp Version: 3.10.6 %global buildversion 0 -Release: 0.20150713git9c4f78f%{?dist} +Release: 0.20150727gitb37d11d%{?dist} License: GPLv2+ and LGPLv2.1+ and CC-BY URL: http://www.pcp.io Group: Applications/System -Source0: %{name}-%{version}-0.20150713git9c4f78f.tar.gz +Source0: %{name}-%{version}-0.20150727gitb37d11d.tar.gz Source1: pcp-webjs.src.tar.gz # Compat check for distros that already have single install pmda's @@ -780,6 +780,8 @@ License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Lustre Filesytem Comms URL: http://www.pcp.io +Requires: pcp = %{version}-%{release} +Requires: pcp-libs = %{version}-%{release} %description pmda-lustrecomm This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1144,7 +1146,7 @@ Requires: python-six This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics output in JSON. The PMDA is written in Python. # end pcp-pmda-json -%endif +%endif # !%{disable_json} # # C pmdas @@ -1300,6 +1302,7 @@ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Roomtemp shell URL: http://www.pcp.io Requires: pcp = %{version}-%{release} +Requires: pcp-libs = %{version}-%{release} %description pmda-roomtemp This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Room temperature metrics. The PMDA is written in C. @@ -1315,6 +1318,7 @@ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Rpm shell URL: http://www.pcp.io Requires: pcp = %{version}-%{release} +Requires: pcp-libs = %{version}-%{release} %description pmda-rpm This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the rpms. The PMDA is written in C. @@ -1330,6 +1334,7 @@ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Sendmail shell URL: http://www.pcp.io Requires: pcp = %{version}-%{release} +Requires: pcp-libs = %{version}-%{release} %description pmda-sendmail This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Sendmail traffic metrics. The PMDA is written in C. @@ -1359,6 +1364,7 @@ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Summary shell URL: http://www.pcp.io Requires: pcp = %{version}-%{release} +Requires: pcp-libs = %{version}-%{release} %description pmda-summary This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about other installed pmdas. The PMDA is written in C. @@ -1404,6 +1410,7 @@ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for the Weblog shell URL: http://www.pcp.io Requires: pcp = %{version}-%{release} +Requires: pcp-libs = %{version}-%{release} %description pmda-weblog This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about web server logs. The PMDA is written in C. @@ -1544,6 +1551,7 @@ Requires: python3-pcp = %{version}-%{release} %if !%{disable_python2} Requires: python-pcp = %{version}-%{release} %endif +Requires: pcp-libs = %{version}-%{release} %description -n pcp-system-tools This PCP module contains additional system monitoring tools written in python. @@ -1605,7 +1613,7 @@ rm -Rf $RPM_BUILD_ROOT %if !%{disable_python2} && 0%{?default_python} != 3 export PYTHON=python%{?default_python} %endif -%configure %{?_with_initd} %{?_with_doc} %{?_with_ib} %{?_with_papi} %{?_with_perfevent} +%configure %{?_with_initd} %{?_with_doc} %{?_with_ib} %{?_with_papi} %{?_with_perfevent} %{?_with_json} make %{?_smp_mflags} default_pcp %install @@ -1658,15 +1666,6 @@ 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 0%{?default_python} != 0 -# defaulting to explicit python version requires /usr/bin/pythonN hashbang -# lines (for either python3 or python26 on epel5), 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/python%{default_python}|" $f -done -%endif - # list of PMDAs in the base pkg ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\ grep -E -v '^simple|sample|trivial|txmon' |\ @@ -2369,6 +2368,10 @@ cd %endif %changelog +* Mon Jul 27 2015 Lukas Berk - 3.10.6-0.20150727gitb37d11d +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Mon Jul 13 2015 Lukas Berk - 3.10.6-0.20150713git9c4f78f - Automated weekly rawhide release - Applied spec changes from upstream git diff --git a/sources b/sources index 09127c7..a0477ef 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -33df2d5c803eef8be195c0ed7e5f02d0 pcp-3.10.6-0.20150713git9c4f78f.tar.gz +bed5966c2676df2a3c134f38867eee17 pcp-3.10.6-0.20150727gitb37d11d.tar.gz 628bb0764c2ee9647a79ed50136ed12f pcp-webjs.src.tar.gz