1
0

- wrap recommends with if suse_version

OBS-URL: https://build.opensuse.org/package/show/server:monitoring/monitoring-plugins?expand=0&rev=30
This commit is contained in:
Ruediger Oertel 2017-04-21 10:20:26 +00:00 committed by Git OBS Bridge
parent 6adec55017
commit 3a3b1950bb
2 changed files with 13 additions and 0 deletions

View File

@ -3,6 +3,7 @@ Fri Apr 21 12:13:06 CEST 2017 - ro@suse.de
- adapt buildrequires for centos - adapt buildrequires for centos
- enclose all permissions handling with if suse_version - 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 Fri Jan 13 10:11:02 UTC 2017 - lars@linux-schulserver.de

View File

@ -114,6 +114,7 @@ BuildRequires: krb5-devel
%endif %endif
# recommend the old, included checks to allow an easy update - but # recommend the old, included checks to allow an easy update - but
# also allow users to deselect some of the new sub-packages # also allow users to deselect some of the new sub-packages
%if 0%{?suse_version}
Recommends: %{name}-bgpstate Recommends: %{name}-bgpstate
Recommends: %{name}-breeze Recommends: %{name}-breeze
Recommends: %{name}-by_ssh Recommends: %{name}-by_ssh
@ -161,6 +162,7 @@ Recommends: %{name}-ups
Recommends: %{name}-users Recommends: %{name}-users
Recommends: %{name}-wave Recommends: %{name}-wave
Suggests: %{name}-cups Suggests: %{name}-cups
%endif
%define apt_get_command %{_bindir}/apt-get %define apt_get_command %{_bindir}/apt-get
%define qstat_command %{_bindir}/qstat %define qstat_command %{_bindir}/qstat
@ -176,6 +178,7 @@ This package contains those plugins.
Summary: Plug-Ins which depend on additional packages Summary: Plug-Ins which depend on additional packages
Group: System/Monitoring Group: System/Monitoring
Requires: %{name}-common = %{version} Requires: %{name}-common = %{version}
%if 0%{?suse_version}
Recommends: %{name}-fping Recommends: %{name}-fping
Recommends: %{name}-hpjd Recommends: %{name}-hpjd
Recommends: %{name}-ldap Recommends: %{name}-ldap
@ -184,6 +187,7 @@ Recommends: %{name}-pgsql
Recommends: %{name}-snmp Recommends: %{name}-snmp
Suggests: %{name}-apt Suggests: %{name}-apt
Suggests: %{name}-game Suggests: %{name}-game
%endif
Provides: nagios-plugins-extras = %{version} Provides: nagios-plugins-extras = %{version}
Obsoletes: nagios-plugins-extras <= 1.5 Obsoletes: nagios-plugins-extras <= 1.5
@ -194,6 +198,7 @@ which have to be installed.
%package all %package all
Summary: All Monitoring-Plugin checks Summary: All Monitoring-Plugin checks
Group: System/Monitoring Group: System/Monitoring
%if 0%{?suse_version}
Recommends: %{name}-apt Recommends: %{name}-apt
Recommends: %{name}-bgpstate Recommends: %{name}-bgpstate
Recommends: %{name}-bind Recommends: %{name}-bind
@ -255,11 +260,13 @@ Recommends: %{name}-radius
Recommends: %{name}-real Recommends: %{name}-real
Recommends: %{name}-rpc Recommends: %{name}-rpc
Recommends: %{name}-rsync Recommends: %{name}-rsync
%endif
Provides: nagios-plugins-all = %{version} Provides: nagios-plugins-all = %{version}
Obsoletes: nagios-plugins-all <= 1.5 Obsoletes: nagios-plugins-all <= 1.5
%ifnarch ppc ppc64 sparc sparc64 s390 s390x %ifnarch ppc ppc64 sparc sparc64 s390 s390x
Recommends: %{name}-sensors Recommends: %{name}-sensors
%endif %endif
%if 0%{?suse_version}
Recommends: %{name}-smtp Recommends: %{name}-smtp
Recommends: %{name}-snmp Recommends: %{name}-snmp
Recommends: %{name}-ssh Recommends: %{name}-ssh
@ -272,6 +279,7 @@ Recommends: %{name}-users
Recommends: %{name}-wave Recommends: %{name}-wave
Recommends: %{name}-zypper Recommends: %{name}-zypper
Recommends: nagios-xen-host Recommends: nagios-xen-host
%endif
%description all %description all
This virtual package recommends all currently available, official This virtual package recommends all currently available, official
@ -681,7 +689,9 @@ sendmail queues, qmail).
%package mrtg %package mrtg
Summary: Check average or maximum value in an MRTG logfile Summary: Check average or maximum value in an MRTG logfile
Group: System/Monitoring Group: System/Monitoring
%if 0%{?suse_version}
Recommends: mrtg Recommends: mrtg
%endif
Provides: nagios-plugins-mrtg = %{version} Provides: nagios-plugins-mrtg = %{version}
Obsoletes: nagios-plugins-mrtg <= 1.5 Obsoletes: nagios-plugins-mrtg <= 1.5
@ -692,7 +702,9 @@ two variables recorded in an MRTG log file.
%package mrtgtraf %package mrtgtraf
Summary: Check incoming/outgoing transfer rates of a router Summary: Check incoming/outgoing transfer rates of a router
Group: System/Monitoring Group: System/Monitoring
%if 0%{?suse_version}
Recommends: mrtg Recommends: mrtg
%endif
Provides: nagios-plugins-mrtgtraf = %{version} Provides: nagios-plugins-mrtgtraf = %{version}
Obsoletes: nagios-plugins-mrtgtraf <= 1.5 Obsoletes: nagios-plugins-mrtgtraf <= 1.5