From 077e862e6f1b49e143cb89a90cc043c235e8cdab Mon Sep 17 00:00:00 2001 From: Gardar Thorsteinsson Date: Wed, 9 May 2018 23:00:16 +0000 Subject: [PATCH] fixed perl-utils dependency problem by filtering out in spec file --- check_bl/nagios-okplugin-mailblacklist.spec | 2 +- check_brocade/nagios-okplugin-brocade.spec | 9 +++++++-- check_cifs/nagios-okplugin-cifs.spec | 9 +++++++-- check_msa_hardware-pl/nagios-okplugin-check_msa.spec | 9 +++++++-- check_snmp/nagios-okplugin-check_snmp.spec | 9 +++++++-- 5 files changed, 29 insertions(+), 9 deletions(-) diff --git a/check_bl/nagios-okplugin-mailblacklist.spec b/check_bl/nagios-okplugin-mailblacklist.spec index 2ecabd7..a2feaa6 100644 --- a/check_bl/nagios-okplugin-mailblacklist.spec +++ b/check_bl/nagios-okplugin-mailblacklist.spec @@ -11,7 +11,7 @@ Source0: http://opensource.ok.is/trac/browser/nagios-plugins/check_bl/releases/% Requires: nagios-plugins Requires: nagios-plugins-perl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Packager: Tomas Edwardsson +Packager: Gardar Thorsteinsson BuildArch: noarch diff --git a/check_brocade/nagios-okplugin-brocade.spec b/check_brocade/nagios-okplugin-brocade.spec index d0c56b4..ff2c2dc 100644 --- a/check_brocade/nagios-okplugin-brocade.spec +++ b/check_brocade/nagios-okplugin-brocade.spec @@ -3,14 +3,14 @@ Summary: A Nagios plugin to check Brocade devices Name: nagios-okplugin-brocade Version: 0.0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://opensource.ok.is/trac/wiki/Nagios-OKPlugin-Brocade Source0: http://opensource.ok.is/trac/browser/nagios-plugins/check_brocade/releases/nagios-okplugin-brocade-%{version}.tar.gz Requires: perl-Nagios-Plugin BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Packager: Tomas Edwardsson +Packager: Gardar Thorsteinsson %description @@ -20,6 +20,8 @@ Checks Brocade devices %setup -q perl -pi -e "s|/usr/lib|%{_libdir}|g" check_brocade_env +%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\) + %build @@ -36,6 +38,9 @@ rm -rf %{buildroot} %{_libdir}/nagios/plugins/* %changelog +* Fri May 09 2018 Gardar Thorsteinsson 0.0.5-2 +- filter out perl-utils dep + * Thu Feb 20 2014 Pall Sigurdsson 0.0.5-1 - diff --git a/check_cifs/nagios-okplugin-cifs.spec b/check_cifs/nagios-okplugin-cifs.spec index ecf2f4a..489892f 100644 --- a/check_cifs/nagios-okplugin-cifs.spec +++ b/check_cifs/nagios-okplugin-cifs.spec @@ -3,7 +3,7 @@ Summary: A Nagios plugin to check CIFS shares Name: nagios-okplugin-cifs Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://opensource.ok.is/trac/wiki/Nagios-OKPlugin-Brocade @@ -11,7 +11,7 @@ Source0: http://opensource.ok.is/trac/browser/nagios-plugins/check_cifs/releases Requires: perl-Nagios-Plugin Requires: samba-client, krb5-workstation BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Packager: Tomas Edwardsson +Packager: Gardar Thorsteinsson BuildArch: noarch @@ -23,6 +23,8 @@ NTML authentication %setup -q perl -pi -e "s|/usr/lib|%{_libdir}|g" check_cifs +%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\) + %build @@ -39,6 +41,9 @@ rm -rf %{buildroot} %{_libdir}/nagios/plugins/* %changelog +* Fri May 09 2018 Gardar Thorsteinsson 1.1-2 +- Filter out perl-utils dep + * Thu Feb 20 2014 Pall Sigurdsson 1.1-1 - Merge github.com:opinkerfi/misc (palli@opensource.is) diff --git a/check_msa_hardware-pl/nagios-okplugin-check_msa.spec b/check_msa_hardware-pl/nagios-okplugin-check_msa.spec index f1e6baf..df85e86 100644 --- a/check_msa_hardware-pl/nagios-okplugin-check_msa.spec +++ b/check_msa_hardware-pl/nagios-okplugin-check_msa.spec @@ -1,11 +1,11 @@ %define debug_package %{nil} %define plugin check_msa_hardware -%define packager Pall Sigurdsson +%define packager Gardar Thorsteinsson Summary: A Nagios plugin to check status of an MSA (HP P2000) disk array Name: nagios-okplugin-%{plugin} Version: 1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ Group: Applications/System URL: https://github.com/opinkerfi/nagios-plugins/tree/master/%{plugin} @@ -21,6 +21,8 @@ Checks status of a remote MSA disk array, also known as HP P2000 %prep %setup -q +%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\) + %build @@ -46,6 +48,9 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg %changelog +* Fri May 09 2018 Gardar Thorsteinsson 1.0.5-2 +- Filter out perl-utils dep + * Thu Jan 30 2014 Pall Sigurdsson 1.0.5-1 - diff --git a/check_snmp/nagios-okplugin-check_snmp.spec b/check_snmp/nagios-okplugin-check_snmp.spec index 0de81c1..6881bff 100644 --- a/check_snmp/nagios-okplugin-check_snmp.spec +++ b/check_snmp/nagios-okplugin-check_snmp.spec @@ -3,14 +3,14 @@ Summary: Various nagios plugins to check cpu,memory,interfaces via SNMP Name: nagios-okplugin-check_snmp Version: 2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: http://opensource.is/trac/wiki/check_snmp Source0: http://opensource.ok.is/trac/browser/nagios-plugins/check_snmp/releases/nagios-okplugin-check_snmp-%{version}.tar.gz Requires: perl-Net-SNMP BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Packager: Pall Sigurdsson +Packager: Gardar Thorsteinsson %description @@ -20,6 +20,8 @@ Various nagios plugins to check cpu,memory,interfaces via SNMP %setup -q #perl -pi -e "s|/usr/lib|%{_libdir}|g" nrpe.d/check_hpacucli.cfg +%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\) + %build @@ -45,6 +47,9 @@ rm -rf %{buildroot} %{_libdir}/nagios/plugins/* %changelog +* Fri May 09 2018 Gardar Thorsteinsson 2-2 +- Filter out perl-utils dep + * Thu Feb 20 2014 Pall Sigurdsson 2-1 - make sure nagios does not run us in embedded perl (palli@opensource.is)