The package rpms/pcp.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/pcp.git/commit/?id=7dd6b3631a5f38....
Change:
+%ifarch x86_64
Thanks.
Full change:
============
commit 7dd6b3631a5f3844eb8d703762f91f10a42e3907
Author: Mark Goodwin <mgoodwin(a)redhat.com>
Date: Thu Feb 27 21:54:04 2020 +1100
Update to pcp-5.0.3 community sources
diff --git a/pcp.spec b/pcp.spec
index 4e302f8..b9cc100 100644
--- a/pcp.spec
+++ b/pcp.spec
@@ -1,6 +1,6 @@
Name: pcp
-Version: 5.0.2
-Release: 2%{?dist}
+Version: 5.0.3
+Release: 1%{?dist}
Summary: System-level performance monitoring and performance management
License: GPLv2+ and LGPLv2+ and CC-BY
URL:
https://pcp.io
@@ -14,6 +14,12 @@ Source0: %{bintray}/pcp/source/pcp-%{version}.src.tar.gz
%global __python2 python
%endif
+%if 0%{?rhel} >= 7 || 0%{?fedora} >= 17
+%global _hostname_executable /usr/bin/hostname
+%else
+%global _hostname_executable /bin/hostname
+%endif
+
%if 0%{?fedora} || 0%{?rhel} > 5
%global disable_selinux 0
%else
@@ -75,23 +81,23 @@ Source0: %{bintray}/pcp/source/pcp-%{version}.src.tar.gz
%global perl_interpreter perl
%endif
-# support for pmdabcc
+# support for pmdabcc, check bcc.spec for supported architectures of bcc
%if 0%{?fedora} >= 25 || 0%{?rhel} > 6
-%ifarch s390 s390x armv7hl aarch64 i686
-%global disable_bcc 1
-%else
+%ifarch x86_64 %{power64} aarch64 s390x
%global disable_bcc 0
+%else
+%global disable_bcc 1
%endif
%else
%global disable_bcc 1
%endif
-# support for pmdabpftrace
-%if 0%{?fedora} >= 30 || 0%{?rhel} > 8
-%ifarch s390 s390x armv7hl aarch64 i686
-%global disable_bpftrace 1
-%else
+# support for pmdabpftrace, check bpftrace.spec for supported architectures of bpftrace
+%if 0%{?fedora} >= 30 || 0%{?rhel} > 7
+%ifarch x86_64 %{power64} aarch64 s390x
%global disable_bpftrace 0
+%else
+%global disable_bpftrace 1
%endif
%else
%global disable_bpftrace 1
@@ -108,6 +114,17 @@ Source0: %{bintray}/pcp/source/pcp-%{version}.src.tar.gz
%global disable_json 1
%endif
+# No mssql ODBC driver on non-x86 platforms
+%ifarch x86_64
+%if !%{disable_python2} || !%{disable_python3}
+%global disable_mssql 0
+%else
+%global disable_mssql 1
+%endif
+%else
+%global disable_mssql 1
+%endif
+
# support for pmdanutcracker (perl deps missing on rhel)
%if 0%{?rhel} == 0
%global disable_nutcracker 0
@@ -229,7 +246,7 @@ BuildRequires: perl-generators
BuildRequires: perl-devel perl(strict)
BuildRequires: perl(ExtUtils::MakeMaker) perl(LWP::UserAgent) perl(JSON)
BuildRequires: perl(LWP::UserAgent) perl(Time::HiRes) perl(Digest::MD5)
-BuildRequires: man hostname
+BuildRequires: man %{_hostname_executable}
%if !%{disable_systemd}
BuildRequires: systemd-devel
%endif
@@ -243,7 +260,7 @@ BuildRequires: qt5-qtsvg-devel
%endif
%endif
-Requires: bash xz gawk sed grep findutils which hostname
+Requires: bash xz gawk sed grep findutils which %{_hostname_executable}
Requires: pcp-libs = %{version}-%{release}
%if !%{disable_selinux}
Requires: pcp-selinux = %{version}-%{release}
@@ -482,7 +499,10 @@ Requires: pcp-pmda-bpftrace
%if !%{disable_python2} || !%{disable_python3}
Requires: pcp-pmda-gluster pcp-pmda-zswap pcp-pmda-unbound pcp-pmda-mic
Requires: pcp-pmda-libvirt pcp-pmda-lio pcp-pmda-openmetrics pcp-pmda-haproxy
-Requires: pcp-pmda-lmsensors pcp-pmda-mssql pcp-pmda-netcheck
+Requires: pcp-pmda-lmsensors pcp-pmda-netcheck
+%endif
+%if !%{disable_mssql}
+Requires: pcp-pmda-mssql
%endif
%if !%{disable_snmp}
Requires: pcp-pmda-snmp
@@ -929,6 +949,8 @@ Requires: perl-PCP-PMDA = %{version}-%{release}
Requires: perl(LWP::UserAgent)
Requires: perl(XML::LibXML)
Requires: perl(File::Slurp)
+Requires: perl-autodie
+Requires: perl-Time-HighRes
%description pmda-bind2
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@@ -943,6 +965,8 @@ License: GPLv2+
Summary: Performance Co-Pilot (PCP) metrics for Redis
URL:
https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
+Requires: perl-autodie
+Requires: perl-Time-HiRes
%description pmda-redis
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@@ -989,6 +1013,7 @@ License: GPLv2+
Summary: Performance Co-Pilot (PCP) metrics for Database response times and
Availablility
URL:
https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
+Requires: perl-DBI
%description pmda-dbping
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@@ -1021,6 +1046,7 @@ Summary: Performance Co-Pilot (PCP) metrics for 389 Directory Server
Loggers
URL:
https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
Requires: perl-Date-Manip
+Requires: 389-ds-base
%description pmda-ds389log
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@@ -1050,6 +1076,8 @@ License: GPLv2+
Summary: Performance Co-Pilot (PCP) metrics for a GPS Daemon
URL:
https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
+Requires: perl-Time-HiRes
+Requires: perl-JSON
%description pmda-gpsd
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@@ -1210,6 +1238,7 @@ License: GPLv2+
Summary: Performance Co-Pilot (PCP) metrics for PowerDNS
URL:
https://pcp.io
Requires: perl-PCP-PMDA = %{version}-%{release}
+Requires: perl-Time-HiRes
%description pmda-pdns
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
@@ -1608,6 +1637,7 @@ License: GPLv2+
Summary: Performance Co-Pilot (PCP) metrics for hardware sensors
URL:
https://pcp.io
Requires: pcp-libs = %{version}-%{release}
+Requires: lm_sensors
%if !%{disable_python3}
Requires: python3-pcp
%else
@@ -1621,11 +1651,11 @@ collecting metrics about the Linux hardware monitoring sensors.
# end pcp-pmda-lmsensors
#
-# pcp-pmda-mssql
+# pcp-pmda-netcheck
#
-%package pmda-mssql
+%package pmda-netcheck
License: GPLv2+
-Summary: Performance Co-Pilot (PCP) metrics for Microsoft SQL Server
+Summary: Performance Co-Pilot (PCP) metrics for simple network checks
URL:
https://pcp.io
Requires: pcp-libs = %{version}-%{release}
%if !%{disable_python3}
@@ -1633,17 +1663,20 @@ Requires: python3-pcp
%else
Requires: %{__python2}-pcp
%endif
-%description pmda-mssql
+%description pmda-netcheck
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
-collecting metrics from Microsoft SQL Server.
-# end pcp-pmda-mssql
+collecting metrics from simple network checks.
+# end pcp-pmda-netcheck
+
+%endif
+%if !%{disable_mssql}
#
-# pcp-pmda-netcheck
+# pcp-pmda-mssql
#
-%package pmda-netcheck
+%package pmda-mssql
License: GPLv2+
-Summary: Performance Co-Pilot (PCP) metrics for simple network checks
+Summary: Performance Co-Pilot (PCP) metrics for Microsoft SQL Server
URL:
https://pcp.io
Requires: pcp-libs = %{version}-%{release}
%if !%{disable_python3}
@@ -1651,11 +1684,10 @@ Requires: python3-pcp
%else
Requires: %{__python2}-pcp
%endif
-%description pmda-netcheck
+%description pmda-mssql
This package contains the PCP Performance Metrics Domain Agent (PMDA) for
-collecting metrics from simple network checks.
-# end pcp-pmda-netcheck
-
+collecting metrics from Microsoft SQL Server.
+# end pcp-pmda-mssql
%endif
%if !%{disable_json}
@@ -1867,6 +1899,7 @@ License: GPLv2+
Summary: Performance Co-Pilot (PCP) metrics for S.M.A.R.T values
URL:
https://pcp.io
Requires: pcp-libs = %{version}-%{release}
+Requires: smartmontools
%description pmda-smart
This package contains the PCP Performance Metric Domain Agent (PMDA) for
collecting metrics of disk S.M.A.R.T values making use of data from the
@@ -2111,6 +2144,11 @@ rm -f $RPM_BUILD_ROOT/%{_pmdasdir}/ib
rm -fr $RPM_BUILD_ROOT/%{_pmdasdir}/infiniband
%endif
+%if %{disable_mssql}
+# remove pmdamssql on platforms lacking MSODBC driver packages.
+rm -fr $RPM_BUILD_ROOT/%{_pmdasdir}/mssql
+%endif
+
%if %{disable_selinux}
rm -fr $RPM_BUILD_ROOT/%{_selinuxdir}
%endif
@@ -2129,6 +2167,10 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/pcp-gui
desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/pmchart.desktop
%endif
+%if %{disable_xlsx}
+rm -f $RPM_BUILD_ROOT/%{_bashcompdir}/pcp2xlsx
+%endif
+
%if 0%{?rhel} || 0%{?fedora}
# Fedora and RHEL default local only access for pmcd and pmlogger
sed -i -e '/^# .*_LOCAL=1/s/^# //'
$RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/{pmcd,pmlogger}
@@ -2214,7 +2256,7 @@ ls -1 $RPM_BUILD_ROOT/%{_pmdasdir} |\
# all base pcp package files except those split out into sub-packages
ls -1 $RPM_BUILD_ROOT/%{_bindir} |\
- grep -E -v 'pmiostat|zabbix|zbxpcp|dstat|pmrep' |\
+ grep -E -v 'pmiostat|zabbix|zbxpcp|dstat|pmrep|pcp2csv' |\
grep -E -v 'pcp2spark|pcp2graphite|pcp2influxdb|pcp2zabbix' |\
grep -E -v 'pcp2elasticsearch|pcp2json|pcp2xlsx|pcp2xml' |\
grep -E -v 'pmdbg|pmclient|pmerr|genpmda' |\
@@ -2222,7 +2264,7 @@ sed -e 's#^#'%{_bindir}'\/#' >base_bin.list
ls -1 $RPM_BUILD_ROOT/%{_bashcompdir} |\
grep -E -v 'pcp2spark|pcp2graphite|pcp2influxdb|pcp2zabbix' |\
grep -E -v 'pcp2elasticsearch|pcp2json|pcp2xlsx|pcp2xml' |\
- grep -E -v 'pmrep|pmdumptext' |\
+ grep -E -v 'pcp2csv|pmrep|pmdumptext' |\
sed -e 's#^#'%{_bashcompdir}'\/#' >base_bashcomp.list
# Separate the pcp-system-tools package files.
@@ -2230,10 +2272,10 @@ sed -e 's#^#'%{_bashcompdir}'\/#'
>base_bashcomp.list
# so its also in pcp-system-tools.
%if !%{disable_python2} || !%{disable_python3}
ls -1 $RPM_BUILD_ROOT/%{_bindir} |\
- egrep -e 'pmiostat|pmrep|dstat' |\
+ egrep -e 'pmiostat|pmrep|dstat|pcp2csv' |\
sed -e 's#^#'%{_bindir}'\/#' >pcp-system-tools.list
ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\
- egrep -e 'atop|collectl|dmcache|dstat|free|iostat|ipcs|lvmcache|mpstat' \
+ egrep -e 'atop|dmcache|dstat|free|iostat|ipcs|lvmcache|mpstat' \
-e 'numastat|pidstat|shping|tapestat|uptime|verify' |\
sed -e 's#^#'%{_libexecdir}/pcp/bin'\/#' >>pcp-system-tools.list
%endif
@@ -2248,7 +2290,7 @@ ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\
ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\
%if !%{disable_python2} || !%{disable_python3}
- grep -E -v 'atop|collectl|dmcache|dstat|free|iostat|ipcs|lvmcache|mpstat' |\
+ grep -E -v 'atop|dmcache|dstat|free|iostat|ipcs|lvmcache|mpstat' |\
grep -E -v 'numastat|shping|tapestat|uptime|verify|selinux-setup' |\
%endif
grep -E -v 'pmlogger_daily_report' |\
@@ -2503,8 +2545,10 @@ fi
%preun pmda-lmsensors
%{pmda_remove "$1" "lmsensors"}
+%if !%{disable_mssql}
%preun pmda-mssql
%{pmda_remove "$1" "mssql"}
+%endif
%preun pmda-netcheck
%{pmda_remove "$1" "netcheck"}
@@ -3097,9 +3141,6 @@ cd
%files pmda-lmsensors
%{_pmdasdir}/lmsensors
-%files pmda-mssql
-%{_pmdasdir}/mssql
-
%files pmda-netcheck
%{_pmdasdir}/netcheck
@@ -3109,6 +3150,11 @@ cd
%{_libdir}/zabbix
%{_sysconfdir}/zabbix/zabbix_agentd.d/zbxpcp.conf
+%if !%{disable_mssql}
+%files pmda-mssql
+%{_pmdasdir}/mssql
+%endif
+
%if !%{disable_json}
%files pmda-json
%{_pmdasdir}/json
@@ -3217,6 +3263,13 @@ cd
%endif
%changelog
+* Thu Feb 27 2020 Mark Goodwin <mgoodwin(a)redhat.com> - 5.0.3-1
+- Avoid python ctypes bitfield struct on-stack (BZ 1800685)
+- Add dstat support for DM/MD/part devices (BZ 1794273)
+- Fix compilation with gcc version 10 (BZ 1793495)
+- Fix dstat sub-sample averaging (BZ 1780039)
+- Update to latest PCP sources.
+
* Wed Jan 29 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.0.2-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
diff --git a/sources b/sources
index 2e2fdc4..6b028b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (pcp-5.0.2.src.tar.gz) =
3c4917995413841d813dd17168a7cafc007971e665e5d5a24192e2c03fe31af8bb948d928ceb054d369c0c1ae597bac2b1d7df25b9295a312c85777a2f31c4ec
+SHA512 (pcp-5.0.3.src.tar.gz) =
7b7b8d0df933ae555b2b99ba88e1dfceac06d123a2fbdc700f75b22da307073b090ce56bbff64069e1fe002ee14961aef619a84af57c354ff48ad902e2fc87d1