From 3a3b1950bbad20a16c8440fe192154fcf3c7049f1ce3fca1ff7ebafa4065c411 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Fri, 21 Apr 2017 10:20:26 +0000 Subject: [PATCH] - wrap recommends with if suse_version OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=30 --- monitoring-plugins.changes | 1 + monitoring-plugins.spec | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes index 5a1e060..40524b8 100644 --- a/monitoring-plugins.changes +++ b/monitoring-plugins.changes @@ -3,6 +3,7 @@ Fri Apr 21 12:13:06 CEST 2017 - ro@suse.de - adapt buildrequires for centos - enclose all permissions handling with if suse_version +- wrap recommends with if suse_version ------------------------------------------------------------------- Fri Jan 13 10:11:02 UTC 2017 - lars@linux-schulserver.de diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec index 1d1d590..b49100d 100644 --- a/monitoring-plugins.spec +++ b/monitoring-plugins.spec @@ -114,6 +114,7 @@ BuildRequires: krb5-devel %endif # recommend the old, included checks to allow an easy update - but # also allow users to deselect some of the new sub-packages +%if 0%{?suse_version} Recommends: %{name}-bgpstate Recommends: %{name}-breeze Recommends: %{name}-by_ssh @@ -161,6 +162,7 @@ Recommends: %{name}-ups Recommends: %{name}-users Recommends: %{name}-wave Suggests: %{name}-cups +%endif %define apt_get_command %{_bindir}/apt-get %define qstat_command %{_bindir}/qstat @@ -176,6 +178,7 @@ This package contains those plugins. Summary: Plug-Ins which depend on additional packages Group: System/Monitoring Requires: %{name}-common = %{version} +%if 0%{?suse_version} Recommends: %{name}-fping Recommends: %{name}-hpjd Recommends: %{name}-ldap @@ -184,6 +187,7 @@ Recommends: %{name}-pgsql Recommends: %{name}-snmp Suggests: %{name}-apt Suggests: %{name}-game +%endif Provides: nagios-plugins-extras = %{version} Obsoletes: nagios-plugins-extras <= 1.5 @@ -194,6 +198,7 @@ which have to be installed. %package all Summary: All Monitoring-Plugin checks Group: System/Monitoring +%if 0%{?suse_version} Recommends: %{name}-apt Recommends: %{name}-bgpstate Recommends: %{name}-bind @@ -255,11 +260,13 @@ Recommends: %{name}-radius Recommends: %{name}-real Recommends: %{name}-rpc Recommends: %{name}-rsync +%endif Provides: nagios-plugins-all = %{version} Obsoletes: nagios-plugins-all <= 1.5 %ifnarch ppc ppc64 sparc sparc64 s390 s390x Recommends: %{name}-sensors %endif +%if 0%{?suse_version} Recommends: %{name}-smtp Recommends: %{name}-snmp Recommends: %{name}-ssh @@ -272,6 +279,7 @@ Recommends: %{name}-users Recommends: %{name}-wave Recommends: %{name}-zypper Recommends: nagios-xen-host +%endif %description all This virtual package recommends all currently available, official @@ -681,7 +689,9 @@ sendmail queues, qmail). %package mrtg Summary: Check average or maximum value in an MRTG logfile Group: System/Monitoring +%if 0%{?suse_version} Recommends: mrtg +%endif Provides: nagios-plugins-mrtg = %{version} Obsoletes: nagios-plugins-mrtg <= 1.5 @@ -692,7 +702,9 @@ two variables recorded in an MRTG log file. %package mrtgtraf Summary: Check incoming/outgoing transfer rates of a router Group: System/Monitoring +%if 0%{?suse_version} Recommends: mrtg +%endif Provides: nagios-plugins-mrtgtraf = %{version} Obsoletes: nagios-plugins-mrtgtraf <= 1.5