rpms/nagios-plugins/FC-4 nagios-plugins-1.4.3-subst.patch, NONE, 1.1 nagios-plugins.spec, 1.9, 1.10

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/extras/rpms/nagios-plugins/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9652/FC-4

Modified Files:
	nagios-plugins.spec 
Added Files:
	nagios-plugins-1.4.3-subst.patch 
Log Message:
Fixes bugzilla #196356


nagios-plugins-1.4.3-subst.patch:

--- NEW FILE nagios-plugins-1.4.3-subst.patch ---
--- nagios-plugins-1.4.3/plugins-scripts/subst.in.orig	2006-07-24 03:53:45.000000000 +0200
+++ nagios-plugins-1.4.3/plugins-scripts/subst.in	2006-07-24 03:54:24.000000000 +0200
@@ -62,11 +62,11 @@
 # subst will replace the fully qualified command with whatever is
 # returned from the which subroutine
 #
-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
-	match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
-	c=substr($0,RSTART,RLENGTH);
-	sub(c,which(c,path));
-}
+#/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// {
+#	match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/);
+#	c=substr($0,RSTART,RLENGTH);
+#	sub(c,which(c,path));
+#}
 
 {
 	print;


Index: nagios-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/nagios-plugins/FC-4/nagios-plugins.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- nagios-plugins.spec	23 Jul 2006 15:45:44 -0000	1.9
+++ nagios-plugins.spec	24 Jul 2006 02:43:42 -0000	1.10
@@ -1,6 +1,6 @@
 Name: nagios-plugins
 Version: 1.4.3
-Release: 13%{?dist}
+Release: 14%{?dist}
 Summary: Host/service/network monitoring program plugins for Nagios
 
 Group: Applications/System
@@ -8,6 +8,7 @@
 URL: http://nagiosplug.sourceforge.net/
 Source0: http://dl.sf.net/sourceforge/nagiosplug/%{name}-%{version}.tar.gz
 Source1: nagios-plugins.README.Fedora
+Patch0: nagios-plugins-1.4.3-subst.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: openldap-devel
@@ -448,6 +449,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -700,6 +702,9 @@
 %{_libdir}/nagios/plugins/utils.*
 
 %changelog
+* Sun Jul 23 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-14
+- Patched upstream issue: 196356
+
 * Sun Jul 23 2006 Mike McGrath <imlinux at gmail.com> 1.4.3-13
 - nagios-plugins-all now includes nagios-plugins-mysql