- courier-imap{,-pop3} Conflicts: cyrus-imapd; release 6

Changed files:
    courier-imap.spec -> 1.70

diff --git a/courier-imap.spec b/courier-imap.spec
index 6efa6c075f6d8e7b9e4eb2d7c54b196df0fbd590..becf401a3c01eb9cc2cb27df2b668d2bdadd590e 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -7,7 +7,7 @@ Summary:        Courier-IMAP server
 Summary(pl):   Serwer Courier-IMAP
 Name:          courier-imap
 Version:       1.4.2
-Release:       5
+Release:       6
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://download.sourceforge.net/courier/%{name}-%{version}.tar.gz
@@ -31,6 +31,7 @@ BuildRequires:        openssl-devel
 PreReq:                %{name}-common = %{version}
 Provides:      imapdaemon
 Obsoletes:     imapdaemon
+Conflicts:     cyrus-imapd
 Conflicts:     imap
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -103,6 +104,7 @@ Group:              Networking/Daemons
 PreReq:                %{name}-common = %{version}
 Provides:      pop3daemon
 Obsoletes:     pop3daemon
+Conflicts:     cyrus-imapd
 Conflicts:     imap-pop3
 Conflicts:     tpop3d
 Conflicts:     solid-pop3d