SPECS (DEVEL): nagios-plugins.spec - renumber patches - more merge...

[glen]

Author: glen                         Date: Sun May 21 21:32:22 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- renumber patches
- more merges from HEAD

---- Files affected:
SPECS:
   nagios-plugins.spec (1.42.2.9 -> 1.42.2.10) 

---- Diffs:

================================================================
Index: SPECS/nagios-plugins.spec
diff -u SPECS/nagios-plugins.spec:1.42.2.9 SPECS/nagios-plugins.spec:1.42.2.10
--- SPECS/nagios-plugins.spec:1.42.2.9	Sun May 21 22:08:17 2006
+++ SPECS/nagios-plugins.spec	Sun May 21 23:32:15 2006
@@ -13,20 +13,19 @@
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz
 # Source0-md5:	2c40fc69d51cc979e85150870a1daa93
-Patch1:		%{name}-tainted.patch
-Patch2:		%{name}-contrib-API.patch
-Patch3:		%{name}-gettext.patch
-Patch4:		%{name}-subst.patch
-Patch5:		%{name}-noroot.patch
-Patch6:		%{name}-check_ping-socket-filter-warning.patch
+Patch0:		%{name}-tainted.patch
+Patch1:		%{name}-contrib-API.patch
+Patch2:		%{name}-gettext.patch
+Patch3:		%{name}-subst.patch
+Patch4:		%{name}-noroot.patch
+Patch5:		%{name}-check_ping-socket-filter-warning.patch
 URL:		http://nagiosplug.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel >= 0.14.3
-BuildRequires:	iputils-ping
 BuildRequires:	mysql-devel
 BuildRequires:	net-snmp-devel
-BuildRequires:	openldap-devel
+BuildRequires:	openldap-devel >= 2.3.0
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	perl-Net-SNMP
 BuildRequires:	postgresql-devel
@@ -367,12 +366,12 @@
 
 %prep
 %setup -q %{?_snap:-n %{name}-HEAD-%{_snap}}
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 # bring contribs into shape...
 cd contrib
@@ -680,6 +679,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.42.2.10  2006/05/21 21:32:15  glen
+- renumber patches
+- more merges from HEAD
+
 Revision 1.42.2.9  2006/05/21 20:08:17  glen
 - add check_mysql_query to -mysql package
 
================================================================

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