diff --git a/0009-remove-rundir-install.patch b/0009-remove-rundir-install.patch new file mode 100644 index 0000000..e8bbaa6 --- /dev/null +++ b/0009-remove-rundir-install.patch @@ -0,0 +1,16 @@ +Index: pcp/GNUmakefile +=================================================================== +--- pcp.orig/GNUmakefile ++++ pcp/GNUmakefile +@@ -80,9 +80,9 @@ ifneq ($(TARGET_OS),mingw) + $(INSTALL) -m 1777 -d $(PCP_TMPFILE_DIR) + endif + $(INSTALL) -m 775 -o $(PCP_USER) -g $(PCP_GROUP) -d $(PCP_TMP_DIR) +-ifeq "$(findstring $(PACKAGE_DISTRIBUTION), debian)" "" ++ifeq (, $(filter debian suse, $(PACKAGE_DISTRIBUTION))) + # PCP_RUN_DIR usually -> /var/run which may be a temporary filesystem +- # and Debian's lintian complains about packages including /var/run/xxx ++ # and lint checks may complain about packages including /var/run/xxx + # artifacts ... PCP_RUN_DIR is also conditionally created on the + # fly in each before use case, so the inclusion in the package is + # sometimes desirable, but not mandatory diff --git a/pcp.changes b/pcp.changes index e15846d..ea4d794 100644 --- a/pcp.changes +++ b/pcp.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Feb 14 21:43:28 UTC 2021 - David Disseldorp + +- Spec file fixes and cleanups + + disable pcp-export-zabbix-agent to avoid conflicting /etc/zabbix/ + ownership. + + fix unversioned Provides + + remove unused python2 build logic and unconditionally enable python3 + + 0009-remove-rundir-install.patch + ------------------------------------------------------------------- Wed Feb 10 11:03:13 UTC 2021 - David Disseldorp diff --git a/pcp.spec b/pcp.spec index 806984c..642bed4 100644 --- a/pcp.spec +++ b/pcp.spec @@ -97,6 +97,8 @@ Patch6: 0006-pmsnap-control-var-www-srv-www.patch Patch7: 0007-pmns-Make-drop-duplicate-if-else.patch # PATCH-FIX-UPSTREAM, (queued) ddiss@suse.de Patch8: 0008-fixes-for-GH-1140-PCP_TMPFILE_DIR-used-in-build.patch +# PATCH-FIX-UPSTREAM, (queued) ddiss@suse.de +Patch9: 0009-remove-rundir-install.patch %if 0%{?fedora} || 0%{?rhel} %global disable_selinux 0 @@ -133,28 +135,9 @@ Patch8: 0008-fixes-for-GH-1140-PCP_TMPFILE_DIR-used-in-build.patch %global disable_sheet2pcp 1 -%global disable_python2 0 -# No python3 development environment before el8 -%if 0%{?rhel} == 0 || 0%{?rhel} > 7 %global disable_python3 0 -# Do we wish to mandate python3 use in pcp? (f22+ and el8+) -%else -%global disable_python3 1 -%endif - -# some Python3 deps missing for SLE <= 12SP2 -%if 0%{?sle_version} && 0%{?sle_version} <= 120200 -%global disable_python3 1 -%endif - -# drop python2 packages on Tumbleweed and SLE15 -%if 0%{?fedora} >= 26 || 0%{?rhel} > 7 || 0%{?suse_version} >= 1500 +# drop python2 packages %global _with_python2 --with-python=no -%global disable_python2 1 -%global __python2 python2 -%else -%global __python2 python -%endif %if 0%{?fedora} >= 24 || 0%{?rhel} > 7 %global perl_interpreter perl-interpreter @@ -186,7 +169,7 @@ Patch8: 0008-fixes-for-GH-1140-PCP_TMPFILE_DIR-used-in-build.patch # support for pmdajson %if 0%{?rhel} == 0 || 0%{?rhel} > 6 -%if !%{disable_python2} || !%{disable_python3} +%if !%{disable_python3} %global disable_json 0 %else %global disable_json 1 @@ -197,7 +180,7 @@ Patch8: 0008-fixes-for-GH-1140-PCP_TMPFILE_DIR-used-in-build.patch # No mssql ODBC driver on non-x86 platforms %ifarch x86_64 -%if !%{disable_python2} || !%{disable_python3} +%if !%{disable_python3} %global disable_mssql 0 %else %global disable_mssql 1 @@ -284,14 +267,21 @@ Patch8: 0008-fixes-for-GH-1140-PCP_TMPFILE_DIR-used-in-build.patch %global disable_lio 0 %endif +%if 0%{?suse_version} +# pcp-export-zabbix-agent installs under a zabbix owned directory +%global disable_zabbix_agent 1 +%else +%global disable_zabbix_agent 0 +%endif + # KVM PMDA moved into pcp (no longer using Perl, default on) Obsoletes: pcp-pmda-kvm < %{version} -Provides: pcp-pmda-kvm +Provides: pcp-pmda-kvm = %{version} # PCP REST APIs are now provided by pmproxy Obsoletes: pcp-webapi < 5.0.0 Obsoletes: pcp-webapi-debuginfo < 5.0.0 -Provides: pcp-webapi +Provides: pcp-webapi = %{version} # PCP discovery service now provided by pmfind Obsoletes: pcp-manager < 5.2.0 @@ -395,10 +385,6 @@ Requires: which Requires: cpp Requires: cyrus-sasl Requires: sysconfig -%if !%{disable_python2} -# pmatop needs curses.py -Requires: %{__python2}-curses -%endif %else Requires: initscripts %endif @@ -875,6 +861,7 @@ Requires: %{lib_pkg} = %{version}-%{release} Performance Co-Pilot (PCP) front-end tools for importing collectl data into standard PCP archive logs for replay with any PCP monitoring tool. +%if !%{disable_zabbix_agent} # # pcp-export-zabbix-agent # @@ -885,13 +872,17 @@ Group: %{pcp_gr} URL: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} >= %{version}-%{release} +%else +# this package nests files under %{_sysconfdir}/zabbix, which is provided by: +Requires: zabbix-server %endif %description export-zabbix-agent Performance Co-Pilot (PCP) module for exporting metrics from PCP to Zabbix via the Zabbix agent - see zbxpcp(3) for further details. +%endif -%if !%{disable_python2} || !%{disable_python3} +%if !%{disable_python3} # # pcp-export-pcp2elasticsearch # @@ -901,15 +892,9 @@ License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io Requires: %{lib_pkg} >= %{version}-%{release} -%if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} Requires: python3-requests BuildRequires: python3-requests -%else -Requires: %{__python2}-pcp = %{version}-%{release} -Requires: %{__python2}-requests -BuildRequires: %{__python2}-requests -%endif %description export-pcp2elasticsearch Performance Co-Pilot (PCP) front-end tools for exporting metric values @@ -927,11 +912,7 @@ URL: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif -%if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} -%else -Requires: %{__python2}-pcp = %{version}-%{release} -%endif %description export-pcp2graphite Performance Co-Pilot (PCP) front-end tools for exporting metric values @@ -947,15 +928,9 @@ URL: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} >= %{version}-%{release} %endif -%if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} Requires: python3-requests BuildRequires: python3-requests -%else -Requires: %{__python2}-pcp = %{version}-%{release} -Requires: %{__python2}-requests -BuildRequires: %{__python2}-requests -%endif %description export-pcp2influxdb Performance Co-Pilot (PCP) front-end tools for exporting metric values @@ -970,11 +945,7 @@ Summary: Performance Co-Pilot tools for exporting PCP metrics in JSON for License: %{license_gplv2plus} Group: %{pcp_gr} Requires: %{lib_pkg} >= %{version}-%{release} -%if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} -%else -Requires: %{__python2}-pcp = %{version}-%{release} -%endif %description export-pcp2json Performance Co-Pilot (PCP) front-end tools for exporting metric values @@ -989,11 +960,7 @@ Summary: Performance Co-Pilot tools for exporting PCP metrics to Apache S License: %{license_gplv2plus} Group: %{pcp_gr} Requires: %{lib_pkg} >= %{version}-%{release} -%if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} -%else -Requires: %{__python2}-pcp = %{version}-%{release} -%endif %description export-pcp2spark Performance Co-Pilot (PCP) front-end tools for exporting metric values @@ -1010,15 +977,9 @@ Summary: Performance Co-Pilot tools for exporting PCP metrics to Excel License: %{license_gplv2plus} Group: %{pcp_gr} Requires: %{lib_pkg} >= %{version}-%{release} -%if !%{disable_python3} Requires: python3-openpyxl Requires: python3-pcp = %{version}-%{release} BuildRequires: python3-openpyxl -%else -Requires: %{__python2}-openpyxl -Requires: %{__python2}-pcp = %{version}-%{release} -BuildRequires: %{__python2}-openpyxl -%endif %description export-pcp2xlsx Performance Co-Pilot (PCP) front-end tools for exporting metric values @@ -1033,11 +994,7 @@ Summary: Performance Co-Pilot tools for exporting PCP metrics in XML form License: %{license_gplv2plus} Group: %{pcp_gr} Requires: %{lib_pkg} >= %{version}-%{release} -%if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} -%else -Requires: %{__python2}-pcp = %{version}-%{release} -%endif %description export-pcp2xml Performance Co-Pilot (PCP) front-end tools for exporting metric values @@ -1051,11 +1008,7 @@ Summary: Performance Co-Pilot tools for exporting PCP metrics to Zabbix License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} -%else -Requires: %{__python2}-pcp = %{version}-%{release} -%endif %description export-pcp2zabbix Performance Co-Pilot (PCP) front-end tools for exporting metric values @@ -1623,7 +1576,7 @@ collecting metrics about the Device Mapper Cache and Thin Client. # end pcp-pmda-dm -%if !%{disable_python2} || !%{disable_python3} +%if !%{disable_python3} # # pcp-pmda-gluster # @@ -1632,11 +1585,8 @@ Summary: Performance Co-Pilot (PCP) metrics for the Gluster filesystem License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp -%else -Requires: %{__python2}-pcp -%endif + %description pmda-gluster This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the gluster filesystem. @@ -1650,11 +1600,8 @@ Summary: Performance Co-Pilot (PCP) metrics for NFS Clients License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp -%else -Requires: %{__python2}-pcp -%endif + %description pmda-nfsclient This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics for NFS Clients. @@ -1669,15 +1616,10 @@ Summary: Performance Co-Pilot (PCP) metrics for PostgreSQL License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp Requires: python3-psycopg2 BuildRequires: python3-psycopg2 -%else -Requires: %{__python2}-pcp -Requires: %{__python2}-psycopg2 -BuildRequires: %{__python2}-psycopg2 -%endif + %description pmda-postgresql This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the PostgreSQL database. @@ -1692,11 +1634,8 @@ Summary: Performance Co-Pilot (PCP) metrics for compressed swap License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp -%else -Requires: %{__python2}-pcp -%endif + %description pmda-zswap This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about compressed swap. @@ -1710,11 +1649,8 @@ Summary: Performance Co-Pilot (PCP) metrics for the Unbound DNS Resolver License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp -%else -Requires: %{__python2}-pcp -%endif + %description pmda-unbound This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about the Unbound DNS Resolver. @@ -1728,11 +1664,8 @@ Summary: Performance Co-Pilot (PCP) metrics for Intel MIC cards License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp -%else -Requires: %{__python2}-pcp -%endif + %description pmda-mic This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Intel MIC cards. @@ -1746,11 +1679,8 @@ Summary: Performance Co-Pilot (PCP) metrics for HAProxy License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp -%else -Requires: %{__python2}-pcp -%endif + %description pmda-haproxy This package contains the PCP Performance Metrics Domain Agent (PMDA) for extracting performance metrics from HAProxy over the HAProxy stats socket. @@ -1765,7 +1695,6 @@ Summary: Performance Co-Pilot (PCP) metrics for virtual machines License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} %if 0%{?suse_version} Requires: python3-libvirt-python BuildRequires: python3-libvirt-python @@ -1776,13 +1705,7 @@ BuildRequires: libvirt-python3 Requires: python3-lxml BuildRequires: python3-lxml Requires: python3-pcp -%else -Requires: %{__python2}-lxml -BuildRequires: %{__python2}-lxml -Requires: %{__python2}-pcp -Requires: libvirt-%{__python2} -BuildRequires: libvirt-%{__python2} -%endif + %description pmda-libvirt This package contains the PCP Performance Metrics Domain Agent (PMDA) for extracting virtualisation statistics from libvirt about behaviour of guest @@ -1798,11 +1721,8 @@ Summary: Performance Co-Pilot (PCP) metrics for Elasticsearch License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp -%else -Requires: %{__python2}-pcp -%endif + %description pmda-elasticsearch This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about Elasticsearch. @@ -1816,11 +1736,8 @@ Summary: Performance Co-Pilot (PCP) metrics for Open vSwitch License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp -%else -Requires: %{__python2}-pcp -%endif + %description pmda-openvswitch This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics from Open vSwitch. @@ -1834,11 +1751,8 @@ Summary: Performance Co-Pilot (PCP) metrics for RabbitMQ queues License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp -%else -Requires: %{__python2}-pcp -%endif + %description pmda-rabbitmq This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics about RabbitMQ message queues. @@ -1853,7 +1767,6 @@ Summary: Performance Co-Pilot (PCP) metrics for the LIO subsystem License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp %if 0%{?suse_version} Requires: python3-rtslib-fb @@ -1862,16 +1775,6 @@ BuildRequires: python3-rtslib-fb Requires: python3-rtslib BuildRequires: python3-rtslib %endif -%else # !%{disable_python3} -Requires: %{__python2}-pcp -%if 0%{?suse_version} -Requires: %{__python2}-rtslib-fb -BuildRequires: %{__python2}-rtslib-fb -%else -Requires: %{__python2}-rtslib -BuildRequires: %{__python2}-rtslib -%endif -%endif # !%{disable_python3} %description pmda-lio This package provides a PMDA to gather performance metrics from the kernels iSCSI target interface (LIO). The metrics are stored by LIO within the Linux @@ -1889,17 +1792,11 @@ Summary: Performance Co-Pilot (PCP) metrics from OpenMetrics endpoints License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp Requires: python3-requests BuildRequires: python3-requests -%else -Requires: %{__python2}-pcp -Requires: %{__python2}-requests -BuildRequires: %{__python2}-requests -%endif Obsoletes: pcp-pmda-prometheus < 5.0.0 -Provides: pcp-pmda-prometheus < 5.0.0 +Provides: pcp-pmda-prometheus = %{version} %description pmda-openmetrics This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1914,11 +1811,7 @@ Summary: Performance Co-Pilot (PCP) metrics for hardware sensors License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp -%else -Requires: %{__python2}-pcp -%endif # rewritten in python, so there is no longer a debuginfo package Obsoletes: pcp-pmda-lmsensors-debuginfo @@ -1938,17 +1831,14 @@ URL: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif -%if !%{disable_python3} Requires: python3-pcp -%else -Requires: %{__python2}-pcp -%endif + %description pmda-netcheck This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics from simple network checks. # end pcp-pmda-netcheck -%endif # !%{disable_python2} || !%{disable_python3} +%endif # !%{disable_python3} %if !%{disable_mssql} # @@ -1962,11 +1852,8 @@ URL: https://pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif -%if !%{disable_python3} Requires: python3-pcp -%else -Requires: %{__python2}-pcp -%endif + %description pmda-mssql This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics from Microsoft SQL Server. @@ -1982,19 +1869,12 @@ Summary: Performance Co-Pilot (PCP) metrics for JSON data License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp Requires: python3-six BuildRequires: python3-six Requires: python3-jsonpointer BuildRequires: python3-jsonpointer -%else -Requires: %{__python2}-jsonpointer -Requires: %{__python2}-pcp -Requires: %{__python2}-six -BuildRequires: %{__python2}-jsonpointer -BuildRequires: %{__python2}-six -%endif + %description pmda-json This package contains the PCP Performance Metrics Domain Agent (PMDA) for collecting metrics output in JSON. @@ -2350,36 +2230,6 @@ automated pmie diagnosis, alerting and self-healing for the localhost. A timer script also writes daily performance summary reports similar to those written by sysstat. -%if !%{disable_python2} -# -# python-pcp. This is the PCP library bindings for python. -# -%package -n %{__python2}-pcp -Summary: Performance Co-Pilot (PCP) Python bindings and documentation -License: %{license_gplv2plus} -Group: %{lib_gr} -URL: https://pcp.io -BuildRequires: %{__python2}-devel -Requires: %{lib_pkg} = %{version}-%{release} -%if 0%{?suse_version} -Requires: libpcp_gui%{libpcp_gui_sover} = %{version}-%{release} -Requires: libpcp_import%{libpcp_import_sover} = %{version}-%{release} -Requires: libpcp_mmv%{libpcp_mmv_sover} = %{version}-%{release} -%endif -Requires: %{__python2} -Requires: pcp = %{version}-%{release} -BuildRequires: %{__python2}-setuptools -%if 0%{?fedora} >= 26 || 0%{?rhel} > 7 || 0%{?sle_version} > 150000 -# on these platforms, python2-pcp replaces python-pcp -Obsoletes: python-pcp -%endif - -%description -n %{__python2}-pcp -This python PCP module contains the language bindings for -Performance Metric API (PMAPI) monitor tools and Performance -Metric Domain Agent (PMDA) collector tools written in Python. -%endif # !%{disable_python2} - %if !%{disable_python3} # # python3-pcp. This is the PCP library bindings for python3. @@ -2404,7 +2254,7 @@ Performance Metric API (PMAPI) monitor tools and Performance Metric Domain Agent (PMDA) collector tools written in Python3. %endif -%if !%{disable_python2} || !%{disable_python3} +%if !%{disable_python3} # # pcp-system-tools # @@ -2413,12 +2263,7 @@ Summary: Performance Co-Pilot (PCP) System and Monitoring Tools License: %{license_gplv2plus} Group: %{pcp_gr} URL: https://pcp.io -%if !%{disable_python3} Requires: python3-pcp = %{version}-%{release} -%endif -%if !%{disable_python2} -Requires: %{__python2}-pcp = %{version}-%{release} -%endif %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif @@ -2509,6 +2354,7 @@ updated policy package. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 autoconf @@ -2588,6 +2434,11 @@ rm -fr $RPM_BUILD_ROOT/%{_pmdasexecdir}/mssql rm -fr $RPM_BUILD_ROOT/%{_confdir}/mssql %endif +%if %{disable_zabbix_agent} +rm -fr $RPM_BUILD_ROOT/%{_libdir}/zabbix +rm -fr $RPM_BUILD_ROOT/%{_sysconfdir}/zabbix +%endif + %if %{disable_sdt} rm -fr $RPM_BUILD_ROOT/%{_tapsetdir} %endif @@ -2704,7 +2555,7 @@ sed -e 's#^#'%{_bashcompdir}'\/#' >base_bashcomp.list # Separate the pcp-system-tools package files. # pmiostat is a back-compat symlink to its pcp(1) sub-command variant # so its also in pcp-system-tools. -%if !%{disable_python2} || !%{disable_python3} +%if !%{disable_python3} ls -1 $RPM_BUILD_ROOT/%{_bindir} |\ grep -E -e 'pmiostat|pmrep|dstat|pcp2csv' |\ sed -e 's#^#'%{_bindir}'\/#' >pcp-system-tools.list @@ -2725,7 +2576,7 @@ ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ %endif ls -1 $RPM_BUILD_ROOT/%{_libexecdir}/pcp/bin |\ -%if !%{disable_python2} || !%{disable_python3} +%if !%{disable_python3} grep -E -v 'atop|dmcache|dstat|free|iostat|ipcs|lvmcache|mpstat' |\ grep -E -v 'numastat|shping|tapestat|uptime|verify|selinux-setup' |\ %endif @@ -3470,7 +3321,7 @@ PCP_LOG_DIR=%{_logsdir} %config(noreplace) %{_confdir}/bpftrace %endif -%if !%{disable_python2} || !%{disable_python3} +%if !%{disable_python3} %files pmda-gluster %{_pmdasdir}/gluster %{_pmdasexecdir}/gluster @@ -3542,14 +3393,14 @@ PCP_LOG_DIR=%{_logsdir} %{_pmdasexecdir}/netcheck %{_confdir}/netcheck -%endif # !%{disable_python2} || !%{disable_python3} +%endif # !%{disable_python3} +%if !%{disable_zabbix_agent} %files export-zabbix-agent %{_libdir}/zabbix -# FIXME: %{_sysconfdir}/zabbix is provided by zabbix-server -%dir %{_sysconfdir}/zabbix %dir %{_sysconfdir}/zabbix/zabbix_agentd.d %config(noreplace) %{_sysconfdir}/zabbix/zabbix_agentd.d/zbxpcp.conf +%endif %if !%{disable_mssql} %files pmda-mssql @@ -3674,16 +3525,6 @@ PCP_LOG_DIR=%{_logsdir} %dir %{_prefix}/lib/perl5/vendor_perl/*/PCP %endif -%if !%{disable_python2} -%files -n %{__python2}-pcp -f python-pcp.list.rpm -%defattr(-,root,root) -%if 0%{?suse_version} -%{python_sitearch}/*.so -%dir %{python_sitearch}/pcp -%{python_sitearch}/pcp -%endif -%endif - %if !%{disable_python3} %files -n python3-pcp -f python3-pcp.list.rpm %defattr(-,root,root) @@ -3725,7 +3566,7 @@ PCP_LOG_DIR=%{_logsdir} %dir %{_selinuxexecdir} %endif -%if !%{disable_python2} || !%{disable_python3} +%if !%{disable_python3} %files system-tools -f pcp-system-tools.list %dir %{_confdir}/dstat %dir %{_confdir}/pmrep