packages: syslog-ng/syslog-ng.spec - C: rsyslog

[gotar]

Author: gotar                        Date: Wed Dec  7 00:40:24 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- C: rsyslog

---- Files affected:
packages/syslog-ng:
   syslog-ng.spec (1.230 -> 1.231) 

---- Diffs:

================================================================
Index: packages/syslog-ng/syslog-ng.spec
diff -u packages/syslog-ng/syslog-ng.spec:1.230 packages/syslog-ng/syslog-ng.spec:1.231
--- packages/syslog-ng/syslog-ng.spec:1.230	Tue Nov 29 18:27:39 2011
+++ packages/syslog-ng/syslog-ng.spec	Wed Dec  7 01:40:18 2011
@@ -89,6 +89,7 @@
 Obsoletes:	syslog-ng-module-dbparser
 Conflicts:	klogd
 Conflicts:	msyslog
+Conflicts:	rsyslog
 Conflicts:	syslog
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -473,6 +474,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.231  2011/12/07 00:40:18  gotar
+- C: rsyslog
+
 Revision 1.230  2011/11/29 17:27:39  arekm
 - systemd subpackage
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syslog-ng/syslog-ng.spec?r1=1.230&r2=1.231&f=u