rpms/syslog-ng/devel syslog-ng.spec,1.36,1.37

[Peter Vrabec]

Author: pvrabec

Update of /cvs/extras/rpms/syslog-ng/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12845

Modified Files:
	syslog-ng.spec 
Log Message:
- do not conflicts with rsyslog, both rsyslog and syslog-ng use
  same pidfile and logrotate file (#441664)



Index: syslog-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- syslog-ng.spec	6 Sep 2008 19:17:43 -0000	1.36
+++ syslog-ng.spec	15 Sep 2008 13:02:10 -0000	1.37
@@ -41,7 +41,6 @@
 # Keep initscripts and vixie-cron happy
 #
 Provides:         syslog
-Conflicts:        rsyslog
 
 %description
 syslog-ng, as the name shows, is a syslogd replacement, but with new
@@ -176,6 +175,10 @@
 
 
 %changelog
+* Mon Sep 15 2008 Peter Vrabec <pvrabec at redhat.com> 2.0.8-3
+- do not conflicts with rsyslog, both rsyslog and syslog-ng use 
+  same pidfile and logrotate file (#441664)
+
 * Sat Sep  6 2008 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-2
 - fix license tag