From 46086b21ec085e1576d83bbf1de53de9532daece Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Tue, 18 Nov 2014 12:16:16 -0500 Subject: [PATCH 1/8] papi 5.4.0 rebuild. --- pcp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcp.spec b/pcp.spec index 91b8c2f..a9464f3 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,7 +1,7 @@ Summary: System-level performance monitoring and performance management Name: pcp Version: 3.10.0 -%define buildversion 1 +%define buildversion 2 Release: %{buildversion}%{?dist} License: GPLv2+ and LGPLv2.1+ @@ -1013,6 +1013,9 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %defattr(-,root,root,-) %changelog +* Tue Nov 18 2014 Dave Brolley - 3.10.0-2 +- papi 5.4.0 rebuild + * Fri Oct 31 2014 Nathan Scott - 3.10.0-1 - Create new sub-packages for pcp-webjs and python3-pcp. - Fix __pmDiscoverServicesWithOptions(1) codes (BZ 1139529) From 69964a5b79254f5094fbac0c7231bf38c748c498 Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Mon, 24 Nov 2014 08:13:00 -0500 Subject: [PATCH 2/8] Automated weekly pcp rawhide release: 0.759.gf6d6a93 --- .gitignore | 1 + pcp.spec | 84 ++++++++++++++++++++++++++++++++++++++++-------------- sources | 3 +- 3 files changed, 64 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 434b566..4955010 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ pcp-3.3.3-1.src.tar.gz /pcpfans-3.9.10.src.tar.gz /pcp-3.10.0.src.tar.gz /pcp-webjs.src.tar.gz +/pcp-3.10.1-0.759.gf6d6a93.tar.gz diff --git a/pcp.spec b/pcp.spec index a9464f3..e901278 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,21 +1,24 @@ Summary: System-level performance monitoring and performance management Name: pcp -Version: 3.10.0 -%define buildversion 2 +Version: 3.10.1 +%define buildversion 1 -Release: %{buildversion}%{?dist} -License: GPLv2+ and LGPLv2.1+ +Release: 0.759.gf6d6a93%{?dist} +License: GPLv2+ and LGPLv2.1+ and CC-BY URL: http://www.pcp.io Group: Applications/System -Source0: pcp-%{version}.src.tar.gz +Source0: %{name}-%{version}-0.759.gf6d6a93.tar.gz Source1: pcp-webjs.src.tar.gz -# There is no papi-devel package for s390 or prior to rhel6, disable it +# There are no papi/libpfm devel packages for s390 nor for some rhels, disable %ifarch s390 s390x %{!?disable_papi: %global disable_papi 1} +%{!?disable_perfevent: %global disable_perfevent 1} %else %{!?disable_papi: %global disable_papi 0%{?rhel} < 6} +%{!?disable_perfevent: %global disable_perfevent 0%{?rhel} < 7} %endif + %define disable_microhttpd 0 %define disable_cairo 0 %if 0%{?rhel} == 0 || 0%{?rhel} > 6 @@ -44,6 +47,9 @@ BuildRequires: cyrus-sasl-devel %if !%{disable_papi} BuildRequires: papi-devel %endif +%if !%{disable_perfevent} +BuildRequires: libpfm-devel >= 4.4 +%endif %if !%{disable_microhttpd} BuildRequires: libmicrohttpd-devel %endif @@ -124,6 +130,10 @@ Obsoletes: pcp-pmda-nvidia %define _with_papi --with-papi=yes %endif +%if !%{disable_perfevent} +%define _with_perfevent --with-perfevent=yes +%endif + %if %{disable_qt} %define _with_ib --with-qt=no %endif @@ -159,7 +169,6 @@ License: LGPLv2+ Group: Development/Libraries Summary: Performance Co-Pilot run-time libraries URL: http://www.pcp.io - Requires: pcp-conf = %{version}-%{release} %description libs @@ -202,7 +211,6 @@ License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) manager daemon URL: http://www.pcp.io - Requires: pcp = %{version}-%{release} Requires: pcp-libs = %{version}-%{release} @@ -227,8 +235,6 @@ License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) web API service URL: http://www.pcp.io - -Requires: pcp = %{version}-%{release} Requires: pcp-libs = %{version}-%{release} %description webapi @@ -250,9 +256,6 @@ BuildArch: noarch Summary: Performance Co-Pilot (PCP) web applications URL: http://www.pcp.io -Requires: pcp-libs = %{version}-%{release} -Requires: pcp-webapi = %{version}-%{release} - %description webjs Javascript web application content for the Performance Co-Pilot (PCP) web service. @@ -397,7 +400,6 @@ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Performance API and hardware counters URL: http://www.pcp.io Requires: pcp-libs = %{version}-%{release} -Requires: papi-devel BuildRequires: papi-devel %description pmda-papi @@ -405,6 +407,24 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting hardware counters statistics through PAPI (Performance API). %endif +%if !%{disable_perfevent} +# +# pcp-pmda-perfevent +# +%package pmda-perfevent +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for hardware counters +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} +Requires: libpfm >= 4.4 +BuildRequires: libpfm-devel >= 4.4 + +%description pmda-perfevent +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting hardware counters statistics through libpfm. +%endif + %if !%{disable_infiniband} # # pcp-pmda-infiniband @@ -505,7 +525,7 @@ PCP utilities and daemons, and the PCP graphical tools. rm -Rf $RPM_BUILD_ROOT %build -%configure %{?_with_initd} %{?_with_doc} %{?_with_ib} %{?_with_papi} %{?_with_qt} +%configure %{?_with_initd} %{?_with_doc} %{?_with_ib} %{?_with_papi} %{?_with_perfevent} %{?_with_qt} make default_pcp %install @@ -532,7 +552,8 @@ rm -fr $RPM_BUILD_ROOT/%{_initddir}/pmwebd rm -fr $RPM_BUILD_ROOT/%{_unitdir}/pmwebd.service rm -f $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin/pmwebd %else -mv pcp-webjs $RPM_BUILD_ROOT/%{_datadir}/pcp/jsdemos +mv pcp-webjs/* $RPM_BUILD_ROOT/%{_datadir}/pcp/webapps +rmdir pcp-webjs %endif %if %{disable_infiniband} @@ -560,6 +581,7 @@ done # list of PMDAs in the base pkg ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\ egrep -v 'simple|sample|trivial|txmon' |\ + egrep -v 'perfevent|perfalloc.1' |\ egrep -v '^ib$|infiniband' |\ egrep -v 'papi' |\ sed -e 's#^#'%{_pmdasdir}'\/#' >base_pmdas.list @@ -843,15 +865,18 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %config(noreplace) %{_confdir}/pmcd/rc.local %dir %{_confdir}/pmproxy %config(noreplace) %{_confdir}/pmproxy/pmproxy.options -%dir %attr(0775,pcp,pcp) %{_confdir}/pmie -%attr(0664,pcp,pcp) %config(noreplace) %{_confdir}/pmie/control -%dir %attr(0775,pcp,pcp) %{_confdir}/pmlogger -%attr(0664,pcp,pcp) %config(noreplace) %{_confdir}/pmlogger/control +%dir %{_confdir}/pmie +%config(noreplace) %{_confdir}/pmie/control +%dir %{_confdir}/pmlogger +%config(noreplace) %{_confdir}/pmlogger/control %{_localstatedir}/lib/pcp/config/pmafm +%dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmie +%{_localstatedir}/lib/pcp/config/pmie/* %{_localstatedir}/lib/pcp/config/pmieconf +%dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmlogger +%{_localstatedir}/lib/pcp/config/pmlogger/* %{_localstatedir}/lib/pcp/config/pmlogconf -%{_localstatedir}/lib/pcp/config/pmlogger %{_localstatedir}/lib/pcp/config/pmlogrewrite %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmda @@ -920,6 +945,7 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %attr(0775,pcp,pcp) %{_logsdir}/pmwebd %{_confdir}/pmwebd %config(noreplace) %{_confdir}/pmwebd/pmwebd.options +%dir %{_datadir}/pcp/webapps %{_mandir}/man1/pmwebd.1.gz %{_mandir}/man3/PMWEBAPI.3.gz %endif @@ -927,7 +953,7 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %if !%{disable_microhttpd} %files webjs %defattr(-,root,root) -%{_datadir}/pcp/jsdemos +%{_datadir}/pcp/webapps/* %endif %files manager @@ -969,6 +995,16 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %{_mandir}/man1/pmdapapi.1.gz %endif +%if !%{disable_perfevent} +%files pmda-perfevent +%defattr(-,root,root) +%{_pmdasdir}/perfevent +%config(noreplace) %{_pmdasdir}/perfevent/perfevent.conf +%{_mandir}/man1/perfalloc.1.gz +%{_mandir}/man1/pmdaperfevent.1.gz +%{_mandir}/man5/perfevent.conf.5.gz +%endif + %if !%{disable_infiniband} %files pmda-infiniband %defattr(-,root,root) @@ -1013,6 +1049,10 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %defattr(-,root,root,-) %changelog +* Mon Nov 24 2014 Lukas Berk - 3.10.1-0.759.gf6d6a93 +- Automated weekly rawhide release +- Applied spec changes from upstream git + * Tue Nov 18 2014 Dave Brolley - 3.10.0-2 - papi 5.4.0 rebuild diff --git a/sources b/sources index c649fc1..d6f985a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -483b20d7245fc0a3ef895a965f2b59c2 pcp-3.10.0.src.tar.gz -819a7f8788022f329b19f93b9c17fb1d pcp-webjs.src.tar.gz +4ed81f5f118330762fe1d2a3cbba577e pcp-3.10.1-0.759.gf6d6a93.tar.gz From 09edac6fbab183cd5b11e70c5ecb2a4e839b57c9 Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Mon, 24 Nov 2014 09:52:22 -0500 Subject: [PATCH 3/8] Automated weekly pcp rawhide release: 0.759.gf6d6a93 --- pcp.spec | 3 +++ sources | 1 + 2 files changed, 4 insertions(+) diff --git a/pcp.spec b/pcp.spec index e901278..7eb6ab7 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1049,6 +1049,9 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %defattr(-,root,root,-) %changelog +* Mon Nov 24 2014 Lukas Berk - 3.10.1-0.759.gf6d6a93 +- Automated weekly rawhide release + * Mon Nov 24 2014 Lukas Berk - 3.10.1-0.759.gf6d6a93 - Automated weekly rawhide release - Applied spec changes from upstream git diff --git a/sources b/sources index d6f985a..867cd27 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 4ed81f5f118330762fe1d2a3cbba577e pcp-3.10.1-0.759.gf6d6a93.tar.gz +bab6bc7dfd3fb5961553d6ccce7a16ff pcp-webjs.src.tar.gz From 7d71df823d1358c221b0258310689e1427c4dc67 Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Mon, 24 Nov 2014 10:45:43 -0500 Subject: [PATCH 4/8] Automated weekly pcp rawhide release: 0.759.gf6d6a93 --- pcp.spec | 3 +++ sources | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pcp.spec b/pcp.spec index 7eb6ab7..939d1a1 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1052,6 +1052,9 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" * Mon Nov 24 2014 Lukas Berk - 3.10.1-0.759.gf6d6a93 - Automated weekly rawhide release +* Mon Nov 24 2014 Lukas Berk - 3.10.1-0.759.gf6d6a93 +- Automated weekly rawhide release + * Mon Nov 24 2014 Lukas Berk - 3.10.1-0.759.gf6d6a93 - Automated weekly rawhide release - Applied spec changes from upstream git diff --git a/sources b/sources index 867cd27..11d1bdc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 4ed81f5f118330762fe1d2a3cbba577e pcp-3.10.1-0.759.gf6d6a93.tar.gz -bab6bc7dfd3fb5961553d6ccce7a16ff pcp-webjs.src.tar.gz +34e17878db46a01bc39811c52e04d6eb pcp-webjs.src.tar.gz From 542454d60e0e452b2a9dfe0fc3b0ec4d96dc2682 Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Mon, 24 Nov 2014 12:09:34 -0500 Subject: [PATCH 5/8] Remove glob from empty %{_localstatedir}/lib/pcp/config/pmie dir This was breaking the build --- pcp.spec | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pcp.spec b/pcp.spec index 939d1a1..717ec0f 100644 --- a/pcp.spec +++ b/pcp.spec @@ -872,7 +872,7 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %{_localstatedir}/lib/pcp/config/pmafm %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmie -%{_localstatedir}/lib/pcp/config/pmie/* +%{_localstatedir}/lib/pcp/config/pmie %{_localstatedir}/lib/pcp/config/pmieconf %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmlogger %{_localstatedir}/lib/pcp/config/pmlogger/* @@ -1049,12 +1049,6 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %defattr(-,root,root,-) %changelog -* Mon Nov 24 2014 Lukas Berk - 3.10.1-0.759.gf6d6a93 -- Automated weekly rawhide release - -* Mon Nov 24 2014 Lukas Berk - 3.10.1-0.759.gf6d6a93 -- Automated weekly rawhide release - * Mon Nov 24 2014 Lukas Berk - 3.10.1-0.759.gf6d6a93 - Automated weekly rawhide release - Applied spec changes from upstream git From 8bdea3d67f323c96d8165c8b91e0f48da577e718 Mon Sep 17 00:00:00 2001 From: Lukas Berk Date: Mon, 24 Nov 2014 12:14:58 -0500 Subject: [PATCH 6/8] Automated weekly pcp rawhide release: 0.759.gf6d6a93 --- pcp.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pcp.spec b/pcp.spec index 717ec0f..a595c4e 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1049,6 +1049,9 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %defattr(-,root,root,-) %changelog +* Mon Nov 24 2014 Lukas Berk - 3.10.1-0.759.gf6d6a93 +- Automated weekly rawhide release + * Mon Nov 24 2014 Lukas Berk - 3.10.1-0.759.gf6d6a93 - Automated weekly rawhide release - Applied spec changes from upstream git From fb3179f0c9de76345d8e3ae3bd636a4b057848c4 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 1 Dec 2014 15:18:53 +1100 Subject: [PATCH 7/8] Update to latest community sources --- .gitignore | 5 +--- pcp.spec | 83 +++++++++++++++++++++++++++++++++++++++++------------- sources | 4 +-- 3 files changed, 66 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 434b566..93f33ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,6 @@ pcp-3.3.3-1.src.tar.gz /pcp-3.5.0-1.src.tar.gz /pcp-3.5.11-1.src.tar.gz -/pcp.spec -/pcp_configure_ppc64.patch /pcp-3.5.11-2.src.tar.gz /pcp-3.6.3-1.src.tar.gz /pcp-3.6.5-1.src.tar.gz @@ -34,7 +32,6 @@ pcp-3.3.3-1.src.tar.gz /pcp-3.9.7.src.tar.gz /pcp-3.9.9.src.tar.gz /pcp-3.9.10.src.tar.gz -/pcpfans-3.9.10.tar.gz -/pcpfans-3.9.10.src.tar.gz /pcp-3.10.0.src.tar.gz /pcp-webjs.src.tar.gz +/pcp-3.10.1.src.tar.gz diff --git a/pcp.spec b/pcp.spec index 91b8c2f..9255c45 100644 --- a/pcp.spec +++ b/pcp.spec @@ -1,21 +1,24 @@ Summary: System-level performance monitoring and performance management Name: pcp -Version: 3.10.0 +Version: 3.10.1 %define buildversion 1 Release: %{buildversion}%{?dist} -License: GPLv2+ and LGPLv2.1+ +License: GPLv2+ and LGPLv2.1+ and CC-BY URL: http://www.pcp.io Group: Applications/System Source0: pcp-%{version}.src.tar.gz Source1: pcp-webjs.src.tar.gz -# There is no papi-devel package for s390 or prior to rhel6, disable it +# There are no papi/libpfm devel packages for s390 nor for some rhels, disable %ifarch s390 s390x %{!?disable_papi: %global disable_papi 1} +%{!?disable_perfevent: %global disable_perfevent 1} %else %{!?disable_papi: %global disable_papi 0%{?rhel} < 6} +%{!?disable_perfevent: %global disable_perfevent 0%{?rhel} < 7} %endif + %define disable_microhttpd 0 %define disable_cairo 0 %if 0%{?rhel} == 0 || 0%{?rhel} > 6 @@ -44,6 +47,9 @@ BuildRequires: cyrus-sasl-devel %if !%{disable_papi} BuildRequires: papi-devel %endif +%if !%{disable_perfevent} +BuildRequires: libpfm-devel >= 4.4 +%endif %if !%{disable_microhttpd} BuildRequires: libmicrohttpd-devel %endif @@ -67,7 +73,7 @@ BuildRequires: desktop-file-utils BuildRequires: qt4-devel >= 4.4 %endif -Requires: bash gawk sed grep fileutils findutils initscripts perl +Requires: bash gawk sed grep fileutils findutils initscripts perl which Requires: python %if 0%{?rhel} <= 5 Requires: python-ctypes @@ -124,6 +130,10 @@ Obsoletes: pcp-pmda-nvidia %define _with_papi --with-papi=yes %endif +%if !%{disable_perfevent} +%define _with_perfevent --with-perfevent=yes +%endif + %if %{disable_qt} %define _with_ib --with-qt=no %endif @@ -159,7 +169,6 @@ License: LGPLv2+ Group: Development/Libraries Summary: Performance Co-Pilot run-time libraries URL: http://www.pcp.io - Requires: pcp-conf = %{version}-%{release} %description libs @@ -202,7 +211,6 @@ License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) manager daemon URL: http://www.pcp.io - Requires: pcp = %{version}-%{release} Requires: pcp-libs = %{version}-%{release} @@ -227,8 +235,6 @@ License: GPLv2+ Group: Applications/System Summary: Performance Co-Pilot (PCP) web API service URL: http://www.pcp.io - -Requires: pcp = %{version}-%{release} Requires: pcp-libs = %{version}-%{release} %description webapi @@ -250,9 +256,6 @@ BuildArch: noarch Summary: Performance Co-Pilot (PCP) web applications URL: http://www.pcp.io -Requires: pcp-libs = %{version}-%{release} -Requires: pcp-webapi = %{version}-%{release} - %description webjs Javascript web application content for the Performance Co-Pilot (PCP) web service. @@ -397,7 +400,6 @@ Group: Applications/System Summary: Performance Co-Pilot (PCP) metrics for Performance API and hardware counters URL: http://www.pcp.io Requires: pcp-libs = %{version}-%{release} -Requires: papi-devel BuildRequires: papi-devel %description pmda-papi @@ -405,6 +407,24 @@ This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting hardware counters statistics through PAPI (Performance API). %endif +%if !%{disable_perfevent} +# +# pcp-pmda-perfevent +# +%package pmda-perfevent +License: GPLv2+ +Group: Applications/System +Summary: Performance Co-Pilot (PCP) metrics for hardware counters +URL: http://www.pcp.io +Requires: pcp-libs = %{version}-%{release} +Requires: libpfm >= 4.4 +BuildRequires: libpfm-devel >= 4.4 + +%description pmda-perfevent +This package contains the PCP Performance Metrics Domain Agent (PMDA) for +collecting hardware counters statistics through libpfm. +%endif + %if !%{disable_infiniband} # # pcp-pmda-infiniband @@ -505,7 +525,7 @@ PCP utilities and daemons, and the PCP graphical tools. rm -Rf $RPM_BUILD_ROOT %build -%configure %{?_with_initd} %{?_with_doc} %{?_with_ib} %{?_with_papi} %{?_with_qt} +%configure %{?_with_initd} %{?_with_doc} %{?_with_ib} %{?_with_papi} %{?_with_perfevent} %{?_with_qt} make default_pcp %install @@ -532,7 +552,8 @@ rm -fr $RPM_BUILD_ROOT/%{_initddir}/pmwebd rm -fr $RPM_BUILD_ROOT/%{_unitdir}/pmwebd.service rm -f $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin/pmwebd %else -mv pcp-webjs $RPM_BUILD_ROOT/%{_datadir}/pcp/jsdemos +mv pcp-webjs/* $RPM_BUILD_ROOT/%{_datadir}/pcp/webapps +rmdir pcp-webjs %endif %if %{disable_infiniband} @@ -560,6 +581,7 @@ done # list of PMDAs in the base pkg ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\ egrep -v 'simple|sample|trivial|txmon' |\ + egrep -v 'perfevent|perfalloc.1' |\ egrep -v '^ib$|infiniband' |\ egrep -v 'papi' |\ sed -e 's#^#'%{_pmdasdir}'\/#' >base_pmdas.list @@ -843,15 +865,18 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %config(noreplace) %{_confdir}/pmcd/rc.local %dir %{_confdir}/pmproxy %config(noreplace) %{_confdir}/pmproxy/pmproxy.options -%dir %attr(0775,pcp,pcp) %{_confdir}/pmie -%attr(0664,pcp,pcp) %config(noreplace) %{_confdir}/pmie/control -%dir %attr(0775,pcp,pcp) %{_confdir}/pmlogger -%attr(0664,pcp,pcp) %config(noreplace) %{_confdir}/pmlogger/control +%dir %{_confdir}/pmie +%config(noreplace) %{_confdir}/pmie/control +%dir %{_confdir}/pmlogger +%config(noreplace) %{_confdir}/pmlogger/control %{_localstatedir}/lib/pcp/config/pmafm +%dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmie +%{_localstatedir}/lib/pcp/config/pmie %{_localstatedir}/lib/pcp/config/pmieconf +%dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmlogger +%{_localstatedir}/lib/pcp/config/pmlogger/* %{_localstatedir}/lib/pcp/config/pmlogconf -%{_localstatedir}/lib/pcp/config/pmlogger %{_localstatedir}/lib/pcp/config/pmlogrewrite %dir %attr(0775,pcp,pcp) %{_localstatedir}/lib/pcp/config/pmda @@ -920,6 +945,7 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %attr(0775,pcp,pcp) %{_logsdir}/pmwebd %{_confdir}/pmwebd %config(noreplace) %{_confdir}/pmwebd/pmwebd.options +%dir %{_datadir}/pcp/webapps %{_mandir}/man1/pmwebd.1.gz %{_mandir}/man3/PMWEBAPI.3.gz %endif @@ -927,7 +953,7 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %if !%{disable_microhttpd} %files webjs %defattr(-,root,root) -%{_datadir}/pcp/jsdemos +%{_datadir}/pcp/webapps/* %endif %files manager @@ -969,6 +995,16 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %{_mandir}/man1/pmdapapi.1.gz %endif +%if !%{disable_perfevent} +%files pmda-perfevent +%defattr(-,root,root) +%{_pmdasdir}/perfevent +%config(noreplace) %{_pmdasdir}/perfevent/perfevent.conf +%{_mandir}/man1/perfalloc.1.gz +%{_mandir}/man1/pmdaperfevent.1.gz +%{_mandir}/man5/perfevent.conf.5.gz +%endif + %if !%{disable_infiniband} %files pmda-infiniband %defattr(-,root,root) @@ -1013,6 +1049,13 @@ chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %defattr(-,root,root,-) %changelog +* Mon Dec 01 2014 Nathan Scott - 3.10.1-1 +- New conditionally-built pcp-pmda-perfevent sub-package. +- Update to latest PCP sources. + +* Tue Nov 18 2014 Dave Brolley - 3.10.0-2 +- papi 5.4.0 rebuild + * Fri Oct 31 2014 Nathan Scott - 3.10.0-1 - Create new sub-packages for pcp-webjs and python3-pcp. - Fix __pmDiscoverServicesWithOptions(1) codes (BZ 1139529) diff --git a/sources b/sources index c649fc1..9aaec10 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -483b20d7245fc0a3ef895a965f2b59c2 pcp-3.10.0.src.tar.gz -819a7f8788022f329b19f93b9c17fb1d pcp-webjs.src.tar.gz +a4fa032729598daad3cab74be3faaba5 pcp-3.10.1.src.tar.gz +34e17878db46a01bc39811c52e04d6eb pcp-webjs.src.tar.gz From d4f2f196d2dcf2d1cc669e043a1af2931f1df0a4 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Mon, 1 Dec 2014 15:27:13 +1100 Subject: [PATCH 8/8] Remove leftover %source setting from autobuilds. --- pcp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcp.spec b/pcp.spec index a080064..87909f2 100644 --- a/pcp.spec +++ b/pcp.spec @@ -7,7 +7,7 @@ Release: %{buildversion}%{?dist} License: GPLv2+ and LGPLv2.1+ and CC-BY URL: http://www.pcp.io Group: Applications/System -Source0: %{name}-%{version}-0.759.gf6d6a93.tar.gz +Source0: %{name}-%{version}.src.tar.gz Source1: pcp-webjs.src.tar.gz # There are no papi/libpfm devel packages for s390 nor for some rhels, disable