SPECS: mailx.spec, nail.spec - don't obsolete, conflict

[patrys]

Author: patrys                       Date: Mon Aug  6 12:57:23 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't obsolete, conflict

---- Files affected:
SPECS:
   mailx.spec (1.45 -> 1.46) , nail.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/mailx.spec
diff -u SPECS/mailx.spec:1.45 SPECS/mailx.spec:1.46
--- SPECS/mailx.spec:1.45	Tue Feb 13 07:46:53 2007
+++ SPECS/mailx.spec	Mon Aug  6 14:57:17 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Tradycyjna metoda wysyłania poczty przy pomocy komendy z shella
 Name:		mailx
 Version:	8.1.1
-Release:	26
+Release:	27
 License:	BSD
 Group:		Applications/Mail
 Source0:	ftp://ftp.ptb.de/pub/mail/unix/%{name}-%{version}.tar.gz
@@ -22,7 +22,7 @@
 Patch10:	%{name}-version.patch
 Patch11:	%{name}-kill_warnings.patch
 Patch12:	%{name}-gcc4.patch
-Obsoletes:	nail-mail
+Conflicts:	nail-mail
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -104,6 +104,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2007/08/06 12:57:17  patrys
+- don't obsolete, conflict
+
 Revision 1.45  2007/02/13 06:46:53  glen
 - tabs in preamble
 

================================================================
Index: SPECS/nail.spec
diff -u SPECS/nail.spec:1.19 SPECS/nail.spec:1.20
--- SPECS/nail.spec:1.19	Sun Apr  1 00:03:40 2007
+++ SPECS/nail.spec	Mon Aug  6 14:57:17 2007
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Rozszerzona implementacja komendy mailx
 Name:		nail
 Version:	11.25
-Release:	3
+Release:	4
 License:	BSD
 Group:		Applications/Mail
 Source0:	http://dl.sourceforge.net/nail/%{name}-%{version}.tar.bz2
@@ -35,7 +35,7 @@
 Summary:	A new /bin/mail - the "traditional" way to mail
 Summary(pl.UTF-8):	Nowy /bin/mail - "tradycyjny" sposób wysyłania poczty
 Group:		Applications/Mail
-Obsoletes:	mailx
+Conflicts:	mailx
 
 %description mail
 The /bin/mail program can be used to send quick mail messages, and is
@@ -137,6 +137,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2007/08/06 12:57:17  patrys
+- don't obsolete, conflict
+
 Revision 1.19  2007/03/31 22:03:40  baggins
 - rel 3
 - s/heimdal/krb5/
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mailx.spec?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/SPECS/nail.spec?r1=1.19&r2=1.20&f=u