SPECS: metalog.spec, msyslog.spec, syslog-ng.spec - conflict inste...

[patrys]

Author: patrys                       Date: Sat Aug  4 16:10:43 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- conflict instead of obsolete

---- Files affected:
SPECS:
   metalog.spec (1.24 -> 1.25) , msyslog.spec (1.21 -> 1.22) , syslog-ng.spec (1.134 -> 1.135) 

---- Diffs:

================================================================
Index: SPECS/metalog.spec
diff -u SPECS/metalog.spec:1.24 SPECS/metalog.spec:1.25
--- SPECS/metalog.spec:1.24	Tue Feb 13 07:46:53 2007
+++ SPECS/metalog.spec	Sat Aug  4 18:10:37 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Wydajny zamiennik syslogd
 Name:		metalog
 Version:	0.7
-Release:	2
+Release:	3
 Epoch:		0
 License:	GPL
 Group:		Daemons
@@ -21,8 +21,8 @@
 Requires:	rc-scripts
 Provides:	syslogdaemon
 Obsoletes:	klogd
-Obsoletes:	syslog
-Obsoletes:	syslog-ng
+Conflicts:	syslog
+Conflicts:	syslog-ng
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -96,6 +96,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2007/08/04 16:10:37  patrys
+- conflict instead of obsolete
+
 Revision 1.24  2007/02/13 06:46:53  glen
 - tabs in preamble
 

================================================================
Index: SPECS/msyslog.spec
diff -u SPECS/msyslog.spec:1.21 SPECS/msyslog.spec:1.22
--- SPECS/msyslog.spec:1.21	Tue Feb 13 08:16:48 2007
+++ SPECS/msyslog.spec	Sat Aug  4 18:10:37 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Modularny demon sysloga
 Name:		msyslog
 Version:	1.09c
-Release:	1
+Release:	2
 Group:		Daemons
 License:	BSD
 Source0:	http://dl.sourceforge.net/msyslog/%{name}-v%{version}-src.tar.gz
@@ -20,10 +20,10 @@
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts
 Provides:	syslogdaemon
-Obsoletes:	syslog
-Obsoletes:	sysklogd
 Obsoletes:	klogd
-Obsoletes:	syslog-ng
+Conflicts:	syslog
+Conflicts:	sysklogd
+Conflicts:	syslog-ng
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -109,6 +109,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2007/08/04 16:10:37  patrys
+- conflict instead of obsolete
+
 Revision 1.21  2007/02/13 07:16:48  glen
 - tabs in preamble
 

================================================================
Index: SPECS/syslog-ng.spec
diff -u SPECS/syslog-ng.spec:1.134 SPECS/syslog-ng.spec:1.135
--- SPECS/syslog-ng.spec:1.134	Sat Aug  4 17:36:29 2007
+++ SPECS/syslog-ng.spec	Sat Aug  4 18:10:37 2007
@@ -45,7 +45,7 @@
 Requires:	rc-scripts >= 0.2.0
 Provides:	syslogdaemon
 Obsoletes:	klogd
-Obsoletes:	msyslog
+Conflicts:	msyslog
 Conflicts:	syslog
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -147,6 +147,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135  2007/08/04 16:10:37  patrys
+- conflict instead of obsolete
+
 Revision 1.134  2007/08/04 15:36:29  patrys
 - conflict with syslog
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/metalog.spec?r1=1.24&r2=1.25&f=u
    http://cvs.pld-linux.org/SPECS/msyslog.spec?r1=1.21&r2=1.22&f=u
    http://cvs.pld-linux.org/SPECS/syslog-ng.spec?r1=1.134&r2=1.135&f=u