SPECS: nagios-plugins.spec - rel 3 - added patches and fixes by Marek Marcz...

[baggins]

Author: baggins                      Date: Fri Dec  5 19:27:16 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3
- added patches and fixes by Marek Marczykowski <marmarek at staszic.waw.pl>
- use system regex
- fix paths in contrib/ plugins

---- Files affected:
SPECS:
   nagios-plugins.spec (1.93 -> 1.94) 

---- Diffs:

================================================================
Index: SPECS/nagios-plugins.spec
diff -u SPECS/nagios-plugins.spec:1.93 SPECS/nagios-plugins.spec:1.94
--- SPECS/nagios-plugins.spec:1.93	Sat Oct 11 18:04:56 2008
+++ SPECS/nagios-plugins.spec	Fri Dec  5 20:27:10 2008
@@ -10,7 +10,7 @@
 Summary(pl.UTF-8):	Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
 Name:		nagios-plugins
 Version:	1.4.13
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz
@@ -33,6 +33,11 @@
 Patch18:	%{name}-configure.patch
 Patch19:	%{name}-perlautodep.patch
 Patch20:	%{name}-cosmetic.patch
+Patch21:	%{name}-check_hpjd-no-paper-out.patch
+Patch22:	%{name}-check_snmp_procs-fix.patch
+Patch23:	%{name}-check_disk_smb-zero-cap.patch
+Patch24:	%{name}-paths.patch
+Patch25:	%{name}-check_snmp_disk_monitor-bulk.patch
 #Patch: %{name}-shared.patch # needs finishing
 URL:		http://www.nagiosplugins.org/
 BuildRequires:	autoconf
@@ -459,6 +464,11 @@
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p0
+%patch22 -p0
+%patch23 -p0
+%patch24 -p0
+%patch25 -p0
 
 # bring contribs into shape...
 cd contrib
@@ -499,7 +509,7 @@
 	s,/usr/local/libexec/nagios,%{_pluginlibdir},
 	s,/usr/local/netsaint/libexec,%{_pluginlibdir},
 	s,/usr/local/libexec,%{_pluginlibdir},
-" check_* *.pl
+" check_* *.pl ../plugins-scripts/*.pl
 
 %build
 %{__gettextize}
@@ -537,7 +547,8 @@
 	--with-df-command='/bin/df -P' \
 	--with-apt-get-command=/usr/bin/apt-get \
 	--with-qmail-qstat-command=/usr/bin/qmail-qstat \
-	--with-mailq-command=/usr/bin/mailq
+	--with-mailq-command=/usr/bin/mailq \
+	--without-included-regex
 
 %{__make}
 
@@ -830,6 +841,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2008/12/05 19:27:10  baggins
+- rel 3
+- added patches and fixes by Marek Marczykowski <marmarek at staszic.waw.pl>
+- use system regex
+- fix paths in contrib/ plugins
+
 Revision 1.93  2008/10/11 16:04:56  glen
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nagios-plugins.spec?r1=1.93&r2=1.94&f=u