diff --git a/pcp.changes b/pcp.changes index b24df77..a31f124 100644 --- a/pcp.changes +++ b/pcp.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Aug 30 23:30:36 UTC 2017 - ddiss@suse.com + +- Enable QT5 builds for Factory (suse_version > 1320); (bsc#1056477). + +------------------------------------------------------------------- +Wed Aug 30 12:38:58 UTC 2017 - ddiss@suse.com + +- Ensure sysconfig files are populated from templates during installation; + (bsc#1056397). + +------------------------------------------------------------------- +Thu Aug 24 15:42:33 UTC 2017 - ddiss@suse.com + +- Add weak pcp dependency to pmdas that were split out from the base package + in the 3.10->3.11 update; (bsc#1055503). + ------------------------------------------------------------------- Mon Jun 19 23:09:32 UTC 2017 - ddiss@suse.com diff --git a/pcp.spec b/pcp.spec index a95bdf1..ff9d150 100644 --- a/pcp.spec +++ b/pcp.spec @@ -173,6 +173,10 @@ Patch9: 0009-pmsnap-control-var-www-srv-www.patch # Qt development and runtime environment missing components before el6 %if 0%{?rhel} == 0 || 0%{?rhel} > 5 %global disable_qt 0 +# We need qt5 for fedora and openSUSE / SLE factory +%if 0%{?fedora} != 0 || 0%{?suse_version} > 1320 +%global default_qt 5 +%endif %else %global disable_qt 1 %endif @@ -280,12 +284,22 @@ BuildRequires: systemd-devel %endif %if !%{disable_qt} BuildRequires: desktop-file-utils +%if 0%{?default_qt} != 5 %if 0%{?suse_version} BuildRequires: libqt4-devel >= 4.4 -%else +%else # suse_version BuildRequires: qt4-devel >= 4.4 -%endif -%endif +%endif # suse_version +%else # default_qt +%if 0%{?suse_version} +BuildRequires: libqt5-qtbase-devel +BuildRequires: libqt5-qtsvg-devel +%else # suse_version +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtsvg-devel +%endif # suse_version +%endif # default_qt +%endif # !disable_qt %if !%{disable_selinux} Requires: pcp-selinux = %{version}-%{release} %endif @@ -962,6 +976,7 @@ License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Supplements: pcp %description pmda-bonding This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -977,6 +992,7 @@ License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Supplements: pcp %description pmda-dbping This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1030,6 +1046,7 @@ Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} Requires: perl(LWP::UserAgent) BuildRequires: perl(LWP::UserAgent) +Supplements: pcp %description pmda-elasticsearch This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1060,6 +1077,7 @@ License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Supplements: pcp %description pmda-gpsd This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1075,6 +1093,7 @@ License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Supplements: pcp %description pmda-kvm This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1122,6 +1141,7 @@ Url: http://www.pcp.io Requires: %{lib_pkg} = %{version}-%{release} %endif Requires: pcp = %{version}-%{release} +Supplements: pcp %description pmda-lustrecomm This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1137,6 +1157,7 @@ License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Supplements: pcp %description pmda-memcache This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1156,6 +1177,7 @@ Requires: perl(DBD::mysql) Requires: perl(DBI) BuildRequires: perl(DBD::mysql) BuildRequires: perl(DBI) +Supplements: pcp %description pmda-mysql This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1171,6 +1193,7 @@ License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Supplements: pcp %description pmda-named This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1185,6 +1208,7 @@ License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Supplements: pcp %description pmda-netfilter This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1200,6 +1224,7 @@ License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Supplements: pcp %description pmda-news This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1264,6 +1289,7 @@ License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Supplements: pcp %description pmda-pdns This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1291,6 +1317,7 @@ BuildRequires: postfix Requires: postfix-doc BuildRequires: postfix-doc %endif +Supplements: pcp %description pmda-postfix This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1311,6 +1338,7 @@ Requires: perl(DBD::Pg) Requires: perl(DBI) BuildRequires: perl(DBD::Pg) BuildRequires: perl(DBI) +Supplements: pcp %description pmda-postgresql This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1327,6 +1355,7 @@ License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Supplements: pcp %description pmda-rsyslog This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1342,6 +1371,7 @@ License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Supplements: pcp %description pmda-samba This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1377,6 +1407,7 @@ Requires: perl-PCP-PMDA = %{version}-%{release} %if 0%{?rhel} == 0 || 0%{?rhel} < 6 Requires: perl(Net::SNMP) %endif +Supplements: pcp %description pmda-snmp This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1393,6 +1424,7 @@ License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Supplements: pcp %description pmda-vmware This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1408,6 +1440,7 @@ License: %{license_gplv2plus} Group: %{pcp_gr} Url: http://www.pcp.io Requires: perl-PCP-PMDA = %{version}-%{release} +Supplements: pcp %description pmda-zimbra This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1614,6 +1647,7 @@ Url: http://www.pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif +Supplements: pcp %description pmda-apache This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1631,6 +1665,7 @@ Url: http://www.pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif +Supplements: pcp %description pmda-bash This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1665,6 +1700,7 @@ Url: http://www.pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif +Supplements: pcp %description pmda-cisco This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1699,6 +1735,7 @@ Url: http://www.pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif +Supplements: pcp %description pmda-lmsensors This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1716,6 +1753,7 @@ Url: http://www.pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif +Supplements: pcp %description pmda-logger This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1734,6 +1772,7 @@ Url: http://www.pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif +Supplements: pcp %description pmda-mailq This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1751,6 +1790,7 @@ Url: http://www.pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif +Supplements: pcp %description pmda-mounts This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1786,6 +1826,7 @@ Url: http://www.pcp.io Requires: %{lib_pkg} = %{version}-%{release} %endif Requires: pcp = %{version}-%{release} +Supplements: pcp %description pmda-roomtemp This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1824,6 +1865,7 @@ Url: http://www.pcp.io Requires: %{lib_pkg} = %{version}-%{release} %endif Requires: pcp = %{version}-%{release} +Supplements: pcp %description pmda-sendmail This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1841,6 +1883,7 @@ Url: http://www.pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif +Supplements: pcp %description pmda-shping This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1860,6 +1903,7 @@ Url: http://www.pcp.io Requires: %{lib_pkg} = %{version}-%{release} %endif Requires: pcp = %{version}-%{release} +Supplements: pcp %description pmda-summary This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1896,6 +1940,7 @@ Url: http://www.pcp.io %if !0%{?suse_version} Requires: %{lib_pkg} = %{version}-%{release} %endif +Supplements: pcp %description pmda-trace This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -1914,6 +1959,7 @@ Url: http://www.pcp.io Requires: %{lib_pkg} = %{version}-%{release} %endif Requires: pcp = %{version}-%{release} +Supplements: pcp %description pmda-weblog This package contains the PCP Performance Metrics Domain Agent (PMDA) for @@ -2589,6 +2635,9 @@ touch "$PCP_PMNS_DIR/.NeedRebuild" chmod 644 "$PCP_PMNS_DIR/.NeedRebuild" %if 0%{?suse_version} %if !%{disable_systemd} +%{fillup_only -n pmcd} +%{fillup_only -n pmlogger} +%{fillup_only -n pmproxy} %service_add_post pmcd %service_add_post pmlogger %service_add_post pmie