- requires(pre): courier-authlib for courier-imap-common to force trigger

  even if -imap, -pop3 isn't installed
- moved userdb trigger to -common package
- rel. 2 STBR

Changed files:
    courier-imap.spec -> 1.145

diff --git a/courier-imap.spec b/courier-imap.spec
index 625c12995eb3ed4481435549cbf88666381462bc..2188d9dc3086e8e1d1c007fb96bbc8ac930e09b1 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -2,7 +2,7 @@ Summary:        Courier-IMAP server
 Summary(pl):   Serwer Courier-IMAP
 Name:          courier-imap
 Version:       4.0.2
-Release:       1
+Release:       2
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
@@ -51,6 +51,7 @@ Summary:      Common files for imap and pop3 daemons
 Summary(pl):   Pliki wspólne dla serwerów imap i pop3
 Group:         Networking/Daemons
 PreReq:                rc-scripts
+Requires(pre): courier-authlib
 Requires(post,preun):  /sbin/chkconfig
 Requires:      procps
 
@@ -194,12 +195,6 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del courier-imap
 fi
 
-%triggerin -- %{name}-userdb < 4.0.2
-echo
-echo courier-imap-userdb is obsolete
-echo install courier-authlib-userdb package
-echo
-
 %triggerin -- %{name} < 3.0.5
 if [ -f /var/lib/openssl/certs/imapd.pem ]; then
        echo
@@ -234,6 +229,12 @@ if [ $TLS_CACHEFILE = "/var/couriersslcache" ]; then
        sed -i s/^TLS_CACHEFILE=.*/"TLS_CACHEFILE=\/var\/spool\/courier-imap\/couriersslcache"/ %{_sysconfdir}/imapd-ssl
 fi
 
+%triggerin -n %{name}-common -- %{name}-userdb
+echo
+echo courier-imap-userdb is obsolete
+echo install courier-authlib-userdb package
+echo
+
 %triggerin -n %{name}-common -- %{name}-common < 3.0.5
 /sbin/chkconfig --del authdaemon
 if [ -f /var/lock/subsys/authdaemon ]; then