SPECS: syslog-ng.spec - conflict with syslog

[patrys]

Author: patrys                       Date: Sat Aug  4 15:36:34 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- conflict with syslog

---- Files affected:
SPECS:
   syslog-ng.spec (1.133 -> 1.134) 

---- Diffs:

================================================================
Index: SPECS/syslog-ng.spec
diff -u SPECS/syslog-ng.spec:1.133 SPECS/syslog-ng.spec:1.134
--- SPECS/syslog-ng.spec:1.133	Wed Apr  4 00:12:36 2007
+++ SPECS/syslog-ng.spec	Sat Aug  4 17:36:29 2007
@@ -11,7 +11,7 @@
 Summary(pt_BR.UTF-8):	Daemon de log nova geração
 Name:		syslog-ng
 Version:	%{mainver}.%{minver}
-Release:	1
+Release:	2
 License:	GPL v2
 Group:		Daemons
 Source0:	http://www.balabit.com/downloads/syslog-ng/%{mainver}/src/%{name}-%{version}.tar.gz
@@ -46,7 +46,7 @@
 Provides:	syslogdaemon
 Obsoletes:	klogd
 Obsoletes:	msyslog
-Obsoletes:	syslog
+Conflicts:	syslog
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -147,6 +147,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.134  2007/08/04 15:36:29  patrys
+- conflict with syslog
+
 Revision 1.133  2007/04/03 22:12:36  qboosh
 - updated to 2.0.3
 - updated link patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/syslog-ng.spec?r1=1.133&r2=1.134&f=u