SPECS: nagios-plugins.spec - restore conflicts line; rel 2

[glen]

Author: glen                         Date: Sun May 21 21:48:31 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- restore conflicts line; rel 2

---- Files affected:
SPECS:
   nagios-plugins.spec (1.50 -> 1.51) 

---- Diffs:

================================================================
Index: SPECS/nagios-plugins.spec
diff -u SPECS/nagios-plugins.spec:1.50 SPECS/nagios-plugins.spec:1.51
--- SPECS/nagios-plugins.spec:1.50	Sun May 21 23:42:21 2006
+++ SPECS/nagios-plugins.spec	Sun May 21 23:48:25 2006
@@ -7,7 +7,7 @@
 Summary(pl):	Wtyczki do monitorowania hostów/usług/sieci dla Nagiosa
 Name:		nagios-plugins
 Version:	1.4.3
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Networking
 Source0:	http://dl.sourceforge.net/nagiosplug/%{name}-%{version}.tar.gz
@@ -34,7 +34,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.177
 Requires:	nagios-core
 Obsoletes:	netsaint-plugins
-Conflicts:	iputils-ping < 1:ss020124
+Conflicts:	iputils-ping < 1:ss021109-3.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_plugindir	%{_libdir}/nagios/plugins
@@ -679,6 +679,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2006/05/21 21:48:25  glen
+- restore conflicts line; rel 2
+
 Revision 1.50  2006/05/21 21:42:21  glen
 - force openssl ssl implementation, rel 1
 
================================================================

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