add conflicts (#400661)

syslog-ng.spec

@@ -12,7 +12,7 @@
 
 Name:             syslog-ng
 Version:          2.0.5
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Syslog replacement daemon
 
 Group:            System Environment/Daemons
@@ -42,6 +42,7 @@ Requires(postun): initscripts
 # Keep initscripts and vixie-cron happy
 #
 Provides:         syslog
+Conflicts:        rsyslog
 
 %description
 syslog-ng, as the name shows, is a syslogd replacement, but with new
@@ -172,6 +173,9 @@ fi
 
 
 %changelog
+* Thu Nov 29 2007 Peter Vrabec <pvrabec@redhat.com> 2.0.5-3
+- add conflicts (#400661)
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.0.5-2
 - Rebuild for selinux ppc32 issue.