From 6adec55017114af08fa98ee3539b42e98f571320d046104fa12d1c8f2b40e381 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Fri, 21 Apr 2017 10:13:44 +0000 Subject: [PATCH] - 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 --- monitoring-plugins.changes | 6 ++++++ monitoring-plugins.spec | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes index 23c6e4a..5a1e060 100644 --- a/monitoring-plugins.changes +++ b/monitoring-plugins.changes @@ -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 diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec index 5c75526..1d1d590 100644 --- a/monitoring-plugins.spec +++ b/monitoring-plugins.spec @@ -63,7 +63,9 @@ Patch118: %{name}.check_hpjd.c-64bit-portability-issue.patch BuildRequires: bind-utils BuildRequires: dhcp-devel BuildRequires: fping +%if 0%{?suse_version} PreReq: permissions +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} > 1210 BuildRequires: libgnutls-devel @@ -79,7 +81,11 @@ BuildRequires: net-snmp-devel BuildRequires: openldap2-devel BuildRequires: openssh BuildRequires: openssl-devel +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +BuildRequires: net-snmp-perl +%else BuildRequires: perl-Net-SNMP +%endif BuildRequires: postfix BuildRequires: postgresql-devel BuildRequires: procps @@ -585,7 +591,11 @@ for details how to setup this check. Summary: Monitor network interfaces Group: System/Monitoring Requires: %{name}-common = %{version} +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +Requires: net-snmp-perl +%else Requires: perl-Net-SNMP +%endif Provides: nagios-plugins-ifoperstatus = %{version} Obsoletes: nagios-plugins-ifoperstatus <= 1.5 @@ -597,7 +607,11 @@ the target host. Summary: Monitor operational status network interfaces Group: System/Monitoring Requires: %{name}-common = %{version} +%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} +Requires: net-snmp-perl +%else Requires: perl-Net-SNMP +%endif Provides: nagios-plugins-ifstatus = %{version} Obsoletes: nagios-plugins-ifstatus <= 1.5 @@ -1033,8 +1047,10 @@ it will provide the size of the queue of age of queue. %prep %setup -q +%if 0%{?suse_version} %{__mkdir_p} example/permissions.d %{__cp} %{S:11} example/permissions.d/%{name} +%endif %{__cp} %{S:12} ./README.SUSE %{__cp} %{S:13} ./README.SUSE-check_dhcp %{__cp} %{S:14} ./README.SUSE-check_icmp @@ -1170,6 +1186,7 @@ touch %{buildroot}%{_sysconfdir}/%{name}/%{name}.ini %clean %{__rm} -rf %{buildroot} +%if 0%{?suse_version} %post dhcp # in case somebody uses the permissions file we provide # in docdir, run permission here @@ -1202,6 +1219,7 @@ if [ -f %{_sysconfdir}/permissions.d/monitoring-plugins ]; then %set_permissions monitoring-plugins %endif fi +%endif %files %defattr(-,root,root)