1
0
mirror of https://github.com/opinkerfi/nagios-plugins.git synced 2024-11-24 11:23:47 +01:00

Merge pull request #37 from opinkerfi/filter-out-perl-utils

fixed perl-utils dependency problem by filtering out in spec file
This commit is contained in:
Garðar Þorsteinsson 2018-05-11 13:05:29 +00:00 committed by GitHub
commit ee29f68bcc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 9 deletions

View File

@ -11,7 +11,7 @@ Source0: http://opensource.ok.is/trac/browser/nagios-plugins/check_bl/releases/%
Requires: nagios-plugins Requires: nagios-plugins
Requires: nagios-plugins-perl Requires: nagios-plugins-perl
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Packager: Tomas Edwardsson <tommi@ok.is> Packager: Gardar Thorsteinsson <gardar@ok.is>
BuildArch: noarch BuildArch: noarch

View File

@ -3,14 +3,14 @@
Summary: A Nagios plugin to check Brocade devices Summary: A Nagios plugin to check Brocade devices
Name: nagios-okplugin-brocade Name: nagios-okplugin-brocade
Version: 0.0.5 Version: 0.0.5
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: http://opensource.ok.is/trac/wiki/Nagios-OKPlugin-Brocade 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 Source0: http://opensource.ok.is/trac/browser/nagios-plugins/check_brocade/releases/nagios-okplugin-brocade-%{version}.tar.gz
Requires: perl-Nagios-Plugin Requires: perl-Nagios-Plugin
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Packager: Tomas Edwardsson <tommi@ok.is> Packager: Gardar Thorsteinsson <gardar@ok.is>
%description %description
@ -20,6 +20,8 @@ Checks Brocade devices
%setup -q %setup -q
perl -pi -e "s|/usr/lib|%{_libdir}|g" check_brocade_env perl -pi -e "s|/usr/lib|%{_libdir}|g" check_brocade_env
%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
%build %build
@ -36,6 +38,9 @@ rm -rf %{buildroot}
%{_libdir}/nagios/plugins/* %{_libdir}/nagios/plugins/*
%changelog %changelog
* Fri May 09 2018 Gardar Thorsteinsson <gardar@ok.is> 0.0.5-2
- filter out perl-utils dep
* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 0.0.5-1 * Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 0.0.5-1
- -

View File

@ -3,7 +3,7 @@
Summary: A Nagios plugin to check CIFS shares Summary: A Nagios plugin to check CIFS shares
Name: nagios-okplugin-cifs Name: nagios-okplugin-cifs
Version: 1.1 Version: 1.1
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: http://opensource.ok.is/trac/wiki/Nagios-OKPlugin-Brocade 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: perl-Nagios-Plugin
Requires: samba-client, krb5-workstation Requires: samba-client, krb5-workstation
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Packager: Tomas Edwardsson <tommi@ok.is> Packager: Gardar Thorsteinsson <gardar@ok.is>
BuildArch: noarch BuildArch: noarch
@ -23,6 +23,8 @@ NTML authentication
%setup -q %setup -q
perl -pi -e "s|/usr/lib|%{_libdir}|g" check_cifs perl -pi -e "s|/usr/lib|%{_libdir}|g" check_cifs
%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
%build %build
@ -39,6 +41,9 @@ rm -rf %{buildroot}
%{_libdir}/nagios/plugins/* %{_libdir}/nagios/plugins/*
%changelog %changelog
* Fri May 09 2018 Gardar Thorsteinsson <gardar@ok.is> 1.1-2
- Filter out perl-utils dep
* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 1.1-1 * Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 1.1-1
- Merge github.com:opinkerfi/misc (palli@opensource.is) - Merge github.com:opinkerfi/misc (palli@opensource.is)

View File

@ -1,11 +1,11 @@
%define debug_package %{nil} %define debug_package %{nil}
%define plugin check_msa_hardware %define plugin check_msa_hardware
%define packager Pall Sigurdsson <palli@opensource.is> %define packager Gardar Thorsteinsson <gardar@ok.is>
Summary: A Nagios plugin to check status of an MSA (HP P2000) disk array Summary: A Nagios plugin to check status of an MSA (HP P2000) disk array
Name: nagios-okplugin-%{plugin} Name: nagios-okplugin-%{plugin}
Version: 1.0.5 Version: 1.0.5
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv3+ License: GPLv3+
Group: Applications/System Group: Applications/System
URL: https://github.com/opinkerfi/nagios-plugins/tree/master/%{plugin} 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 %prep
%setup -q %setup -q
%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
%build %build
@ -46,6 +48,9 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg %config(noreplace) %{_sysconfdir}/nrpe.d/%{plugin}.cfg
%changelog %changelog
* Fri May 09 2018 Gardar Thorsteinsson <gardar@ok.is> 1.0.5-2
- Filter out perl-utils dep
* Thu Jan 30 2014 Pall Sigurdsson <palli@opensource.is> 1.0.5-1 * Thu Jan 30 2014 Pall Sigurdsson <palli@opensource.is> 1.0.5-1
- -

View File

@ -3,14 +3,14 @@
Summary: Various nagios plugins to check cpu,memory,interfaces via SNMP Summary: Various nagios plugins to check cpu,memory,interfaces via SNMP
Name: nagios-okplugin-check_snmp Name: nagios-okplugin-check_snmp
Version: 2 Version: 2
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/System Group: Applications/System
URL: http://opensource.is/trac/wiki/check_snmp 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 Source0: http://opensource.ok.is/trac/browser/nagios-plugins/check_snmp/releases/nagios-okplugin-check_snmp-%{version}.tar.gz
Requires: perl-Net-SNMP Requires: perl-Net-SNMP
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Packager: Pall Sigurdsson <palli@opensource.is> Packager: Gardar Thorsteinsson <gardar@ok.is>
%description %description
@ -20,6 +20,8 @@ Various nagios plugins to check cpu,memory,interfaces via SNMP
%setup -q %setup -q
#perl -pi -e "s|/usr/lib|%{_libdir}|g" nrpe.d/check_hpacucli.cfg #perl -pi -e "s|/usr/lib|%{_libdir}|g" nrpe.d/check_hpacucli.cfg
%global __requires_exclude %{?__requires_exclude:%__requires_exclude}|}^perl\\(utils\\)
%build %build
@ -45,6 +47,9 @@ rm -rf %{buildroot}
%{_libdir}/nagios/plugins/* %{_libdir}/nagios/plugins/*
%changelog %changelog
* Fri May 09 2018 Gardar Thorsteinsson <gardar@ok.is> 2-2
- Filter out perl-utils dep
* Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 2-1 * Thu Feb 20 2014 Pall Sigurdsson <palli@opensource.is> 2-1
- make sure nagios does not run us in embedded perl (palli@opensource.is) - make sure nagios does not run us in embedded perl (palli@opensource.is)