SPECS (DEVEL): nagios-plugins.spec - merge changes from HEAD

[glen]

Author: glen                         Date: Sun May 21 20:01:37 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- merge changes from HEAD

---- Files affected:
SPECS:
   nagios-plugins.spec (1.42.2.7 -> 1.42.2.8) 

---- Diffs:

================================================================
Index: SPECS/nagios-plugins.spec
diff -u SPECS/nagios-plugins.spec:1.42.2.7 SPECS/nagios-plugins.spec:1.42.2.8
--- SPECS/nagios-plugins.spec:1.42.2.7	Sun May 21 21:48:13 2006
+++ SPECS/nagios-plugins.spec	Sun May 21 22:01:32 2006
@@ -3,11 +3,12 @@
 # - package requisites for unifished packages -nsclient and -nwstat
 #   REQUIREMENTS explains the dependencies.
 # - gnutls vs openssl
+%include	/usr/lib/rpm/macros.perl
 Summary:	Host/service/network monitoring program plugins for Nagios
 Summary(pl):	Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
 Name:		nagios-plugins
 Version:	1.4.3
-Release:	0.1
+Release:	0.2
 License:	GPL v2
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz
@@ -17,6 +18,7 @@
 Patch3:		%{name}-gettext.patch
 Patch4:		%{name}-subst.patch
 Patch5:		%{name}-noroot.patch
+Patch6:		%{name}-check_ping-socket-filter-warning.patch
 URL:		http://nagiosplug.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -29,6 +31,7 @@
 BuildRequires:	perl-Net-SNMP
 BuildRequires:	postgresql-devel
 BuildRequires:	radiusclient-devel
+BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.177
 Requires:	nagios-core
@@ -37,6 +40,8 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_plugindir	%{_libdir}/nagios/plugins
+# Not available in Ac
+%define		_noautoreq	'perl(DBD::Oracle)' 'perl(Net::Arping)' 'perl(RRD::File)' 'perl(a)' 'perl(packet_utils)' 'perl(snmputil)'
 
 %description
 Nagios is a program that will monitor hosts and services on your
@@ -367,6 +372,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # bring contribs into shape...
 cd contrib
@@ -377,9 +383,15 @@
 sed -i -e '1s,#!.*/bin/perl,#!%{__perl},' \
 	check_{oracle_tbs,{snmp_{{disk,process}_monitor,printer},nagios_db,flexlm}.pl}
 
+sed -i -e '1s,#!.*/bin/env,#!%{__python},' \
+	check_pcpmetric.py
+
+sed -i -e '1s,#!.*/bin/bash,#!/bin/sh,' \
+	check_smb.sh
+
 sed -i -e "
 	s,use lib '.*/nagios/libexec/',use lib '%{_plugindir}',
-	s,require '.*/nagios/plugins',require '%{_plugindir}',
+	s,require '/usr/libexec/nagios/plugins,require '%{_plugindir},
 	s,use lib utils.pm,use lib '%{_plugindir}',
 " *.pl
 
@@ -431,7 +443,6 @@
 # contrib. mostly useless. but you'll never know
 cd contrib
 
-%{__cc} %{rpmcflags} check_cluster.c -o check_cluster
 %{__cc} %{rpmcflags} check_cluster2.c -o check_cluster2
 
 %{__cc} %{rpmcflags} -I../plugins -I.. -I../lib -c check_rbl.c
@@ -484,6 +495,7 @@
 %{_plugindir}/utils.sh
 
 # plugins
+%{_plugindir}/check_cluster2
 %{_plugindir}/check_disk
 %{_plugindir}/check_dummy
 %{_plugindir}/check_file_age
@@ -599,8 +611,6 @@
 %{_plugindir}/check_axis.sh
 %{_plugindir}/check_backup.pl
 %{_plugindir}/check_bgpstate.pl
-%{_plugindir}/check_cluster
-%{_plugindir}/check_cluster2
 %{_plugindir}/check_compaq_insight.pl
 %{_plugindir}/check_digitemp.pl
 %{_plugindir}/check_disk_snmp.pl
@@ -669,6 +679,22 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42.2.8  2006/05/21 20:01:32  glen
+- merge changes from HEAD
+
+Revision 1.48  2006/04/07 08:42:32  glen
+- use perl autodeps, small fixes
+
+Revision 1.47  2006/04/07 08:11:02  glen
+- move check_cluster2 to base (head is stright in the morning)
+
+Revision 1.46  2006/04/06 22:31:40  glen
+- drop check_cluster (netsaint plugin)
+- separate check_cluster2 from -contrib to -cluster (or put it to main as it has not extra deps?)
+
+Revision 1.45  2006/03/14 13:28:09  glen
+- apply the patch too
+
 Revision 1.42.2.7  2006/05/21 19:48:13  glen
 - adapter
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nagios-plugins.spec?r1=1.42.2.7&r2=1.42.2.8&f=u