Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/pcp.git#da996a75cb2c34255ef38585c85ba5a50d3ecacb
This commit is contained in:
DistroBaker 2020-12-18 00:38:06 +00:00
parent 2334605f7d
commit 25d99c5abd
2 changed files with 14 additions and 4 deletions

View File

@ -1,5 +1,5 @@
Name: pcp Name: pcp
Version: 5.2.2 Version: 5.2.3
Release: 1%{?dist} Release: 1%{?dist}
Summary: System-level performance monitoring and performance management Summary: System-level performance monitoring and performance management
License: GPLv2+ and LGPLv2+ and CC-BY License: GPLv2+ and LGPLv2+ and CC-BY
@ -2339,7 +2339,7 @@ ls -1 $RPM_BUILD_ROOT/%{_bindir} |\
grep -E -e 'pmiostat|pmrep|dstat|pcp2csv' |\ grep -E -e 'pmiostat|pmrep|dstat|pcp2csv' |\
sed -e 's#^#'%{_bindir}'\/#' >pcp-system-tools.list sed -e 's#^#'%{_bindir}'\/#' >pcp-system-tools.list
ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\
grep -E -e 'atop|dmcache|dstat|free|iostat|ipcs|lvmcache|mpstat' \ grep -E -e 'atop|dmcache|dstat|free|htop|iostat|ipcs|lvmcache|mpstat' \
-e 'numastat|pidstat|shping|tapestat|uptime|verify' |\ -e 'numastat|pidstat|shping|tapestat|uptime|verify' |\
sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >>pcp-system-tools.list sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >>pcp-system-tools.list
%endif %endif
@ -2356,7 +2356,7 @@ ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\
ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\
%if !%{disable_python2} || !%{disable_python3} %if !%{disable_python2} || !%{disable_python3}
grep -E -v 'atop|dmcache|dstat|free|iostat|ipcs|lvmcache|mpstat' |\ grep -E -v 'atop|dmcache|dstat|free|htop|iostat|ipcs|lvmcache|mpstat' |\
grep -E -v 'numastat|shping|tapestat|uptime|verify|selinux-setup' |\ grep -E -v 'numastat|shping|tapestat|uptime|verify|selinux-setup' |\
%endif %endif
grep -E -v 'pmlogger_daily_report' |\ grep -E -v 'pmlogger_daily_report' |\
@ -2701,6 +2701,11 @@ then
%systemd_preun pmie.service %systemd_preun pmie.service
%systemd_preun pmproxy.service %systemd_preun pmproxy.service
%systemd_preun pmcd.service %systemd_preun pmcd.service
%systemd_preun pmie_daily.timer
%systemd_preun pmlogger_daily.timer
%systemd_preun pmlogger_daily-poll.timer
%systemd_preun pmlogger_check.timer
systemctl stop pmlogger.service >/dev/null 2>&1 systemctl stop pmlogger.service >/dev/null 2>&1
systemctl stop pmie.service >/dev/null 2>&1 systemctl stop pmie.service >/dev/null 2>&1
systemctl stop pmproxy.service >/dev/null 2>&1 systemctl stop pmproxy.service >/dev/null 2>&1
@ -2896,6 +2901,7 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
%dir %{_confdir}/labels %dir %{_confdir}/labels
%dir %{_confdir}/labels/optional %dir %{_confdir}/labels/optional
%config(noreplace) %{_confdir}/labels.conf %config(noreplace) %{_confdir}/labels.conf
%config(noreplace) %{_confdir}/linux/interfaces.conf
%dir %{_confdir}/pipe.conf.d %dir %{_confdir}/pipe.conf.d
%dir %{_confdir}/pmcd %dir %{_confdir}/pmcd
%config(noreplace) %{_confdir}/pmcd/pmcd.conf %config(noreplace) %{_confdir}/pmcd/pmcd.conf
@ -3211,6 +3217,7 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
%files pmda-bcc %files pmda-bcc
%{_pmdasdir}/bcc %{_pmdasdir}/bcc
%{_pmdasexecdir}/bcc %{_pmdasexecdir}/bcc
%{_confdir}/bcc
%endif %endif
%if !%{disable_bpftrace} %if !%{disable_bpftrace}
@ -3439,6 +3446,9 @@ chown -R pcp:pcp %{_logsdir}/pmproxy 2>/dev/null
%endif %endif
%changelog %changelog
* Fri Dec 18 2020 Nathan Scott <nathans@redhat.com> - 5.2.3-1
- Update to latest PCP sources.
* Wed Nov 11 2020 Nathan Scott <nathans@redhat.com> - 5.2.2-1 * Wed Nov 11 2020 Nathan Scott <nathans@redhat.com> - 5.2.2-1
- Update to latest PCP sources. - Update to latest PCP sources.

View File

@ -1 +1 @@
SHA512 (pcp-5.2.2.src.tar.gz) = 1a302c12879c3beddf102401bde497ad6e5eba60bf2f8260154510fced526b015b72f769c94504e344cadaff63def10ed6d4323ed59b9d56b2aef88d5c56b2a4 SHA512 (pcp-5.2.3.src.tar.gz) = ff495162ad20eae1a37dd17fbaa03915b75239250125fef718d31c1ad05ce27ebd4ec93bdc92330cfc90ec6fb42d4d86da6c10f6725ba1e597c3e291828a7abc