1
0

- adapt buildrequires for centos

- enclose all permissions handling with if suse_version

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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Apr 21 12:13:06 CEST 2017 - ro@suse.de
- adapt buildrequires for centos
- enclose all permissions handling 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

@ -63,7 +63,9 @@ Patch118: %{name}.check_hpjd.c-64bit-portability-issue.patch
BuildRequires: bind-utils BuildRequires: bind-utils
BuildRequires: dhcp-devel BuildRequires: dhcp-devel
BuildRequires: fping BuildRequires: fping
%if 0%{?suse_version}
PreReq: permissions PreReq: permissions
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1210 %if 0%{?suse_version} > 1210
BuildRequires: libgnutls-devel BuildRequires: libgnutls-devel
@ -79,7 +81,11 @@ BuildRequires: net-snmp-devel
BuildRequires: openldap2-devel BuildRequires: openldap2-devel
BuildRequires: openssh BuildRequires: openssh
BuildRequires: openssl-devel BuildRequires: openssl-devel
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
BuildRequires: net-snmp-perl
%else
BuildRequires: perl-Net-SNMP BuildRequires: perl-Net-SNMP
%endif
BuildRequires: postfix BuildRequires: postfix
BuildRequires: postgresql-devel BuildRequires: postgresql-devel
BuildRequires: procps BuildRequires: procps
@ -585,7 +591,11 @@ for details how to setup this check.
Summary: Monitor network interfaces Summary: Monitor network interfaces
Group: System/Monitoring Group: System/Monitoring
Requires: %{name}-common = %{version} Requires: %{name}-common = %{version}
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
Requires: net-snmp-perl
%else
Requires: perl-Net-SNMP Requires: perl-Net-SNMP
%endif
Provides: nagios-plugins-ifoperstatus = %{version} Provides: nagios-plugins-ifoperstatus = %{version}
Obsoletes: nagios-plugins-ifoperstatus <= 1.5 Obsoletes: nagios-plugins-ifoperstatus <= 1.5
@ -597,7 +607,11 @@ the target host.
Summary: Monitor operational status network interfaces Summary: Monitor operational status network interfaces
Group: System/Monitoring Group: System/Monitoring
Requires: %{name}-common = %{version} Requires: %{name}-common = %{version}
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
Requires: net-snmp-perl
%else
Requires: perl-Net-SNMP Requires: perl-Net-SNMP
%endif
Provides: nagios-plugins-ifstatus = %{version} Provides: nagios-plugins-ifstatus = %{version}
Obsoletes: nagios-plugins-ifstatus <= 1.5 Obsoletes: nagios-plugins-ifstatus <= 1.5
@ -1033,8 +1047,10 @@ it will provide the size of the queue of age of queue.
%prep %prep
%setup -q %setup -q
%if 0%{?suse_version}
%{__mkdir_p} example/permissions.d %{__mkdir_p} example/permissions.d
%{__cp} %{S:11} example/permissions.d/%{name} %{__cp} %{S:11} example/permissions.d/%{name}
%endif
%{__cp} %{S:12} ./README.SUSE %{__cp} %{S:12} ./README.SUSE
%{__cp} %{S:13} ./README.SUSE-check_dhcp %{__cp} %{S:13} ./README.SUSE-check_dhcp
%{__cp} %{S:14} ./README.SUSE-check_icmp %{__cp} %{S:14} ./README.SUSE-check_icmp
@ -1170,6 +1186,7 @@ touch %{buildroot}%{_sysconfdir}/%{name}/%{name}.ini
%clean %clean
%{__rm} -rf %{buildroot} %{__rm} -rf %{buildroot}
%if 0%{?suse_version}
%post dhcp %post dhcp
# in case somebody uses the permissions file we provide # in case somebody uses the permissions file we provide
# in docdir, run permission here # in docdir, run permission here
@ -1202,6 +1219,7 @@ if [ -f %{_sysconfdir}/permissions.d/monitoring-plugins ]; then
%set_permissions monitoring-plugins %set_permissions monitoring-plugins
%endif %endif
fi fi
%endif
%files %files
%defattr(-,root,root) %defattr(-,root,root)