- version -> version-release

[packages/courier-imap.git] / courier-imap.spec

diff --git a/courier-imap.spec b/courier-imap.spec
index d21109cac617a79e5570e8b6a8d69c858e330ae4..93781c9acd9a51256777cb4e23379a0579f5f9ea 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -6,12 +6,12 @@
 Summary:       Courier-IMAP server
 Summary(pl):   Serwer Courier-IMAP
 Name:          courier-imap
-Version:       2.1.2
-Release:       1
+Version:       2.2.1
+Release:       4
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5: d77ef5d3c90fd0a70b333a44e0ead0a2
+# Source0-md5: 27c90ce2ac2412bc90994cacbd75616b
 Source1:       %{name}.init
 Source2:       %{name}-pop3.init
 Source3:       %{name}-authdaemon.init
@@ -20,14 +20,17 @@ Source5:    %{name}-pop3.pamd
 Source6:       %{name}.sysconfig
 Source7:       %{name}-pop3.sysconfig
 Source8:       %{name}-authdaemon.sysconfig
-# Patch0:              ftp://ftp.pld.org.pl/people/siefca/patches/courier/%{name}-myownquery.patch
+Patch0:                %{name}-no_res_query.patch
 URL:           http://www.inter7.com/courierimap/
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: gdbm-devel
 BuildRequires: libstdc++-devel
 %{?with_mysql:BuildRequires:   mysql-devel}
 %{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: openssl-devel >= 0.9.7c
 %{?with_pgsql:BuildRequires:   postgresql-devel}
+BuildRequires: sysconftool
 %{?with_mysql:BuildRequires:   zlib-devel}
 PreReq:                %{name}-common = %{version}
 PreReq:                rc-scripts
@@ -105,7 +108,7 @@ formacie Maildir.
 Summary:       Courier-IMAP POP3 Server
 Summary(pl):   Serwer Courier-IMAP POP3
 Group:         Networking/Daemons
-PreReq:                %{name}-common = %{version}
+PreReq:                %{name}-common = %{version}-%{release}
 Requires:      pam >= 0.77.3
 Provides:      pop3daemon
 Obsoletes:     pop3daemon
@@ -124,7 +127,7 @@ Courier-IMAP POP3 jest serwerem POP3 dla skrzynek pocztowych Maildir.
 Summary:       LDAP authentication daemon for Courier IMAP
 Summary(pl):   Demon autentykacji LDAP do Courier IMAP
 Group:         Networking/Daemons
-PreReq:                %{name}-common = %{version}
+PreReq:                %{name}-common = %{version}-%{release}
 
 %description authldap
 This package provides LDAP authentication for Courier IMAP.
@@ -136,7 +139,7 @@ Ten pakiet pozwala na korzystanie z autentykacji LDAP w Courier IMAP.
 Summary:       MySQL authentication daemon for Courier IMAP
 Summary(pl):   Demon autentykacji MySQL do Courier IMAP
 Group:         Networking/Daemons
-PreReq:                %{name}-common = %{version}
+PreReq:                %{name}-common = %{version}-%{release}
 Requires:      zlib
 
 %description authmysql
@@ -149,7 +152,7 @@ Ten pakiet pozwala na korzystanie z autentykacji MySQL w Courier IMAP.
 Summary:       PostgreSQL authentication daemon for Courier IMAP
 Summary(pl):   Demon autentykacji PostgreSQL do Courier IMAP
 Group:         Networking/Daemons
-PreReq:                %{name}-common = %{version}
+PreReq:                %{name}-common = %{version}-%{release}
 
 %description authpgsql
 This package provides PostgreSQL authentication for Courier IMAP.
@@ -160,9 +163,16 @@ IMAP.
 
 %prep
 %setup -q
-#%patch0 -p1
+%patch0 -p1
 
 %build
+cp -f /usr/share/automake/config.sub .
+cp -f /usr/share/automake/config.sub maildir
+cd authlib
+%{__aclocal}
+%{__automake}
+%{__autoconf}
+cd ..
 %configure \
        --enable-unicode \
        --with-authchangepwdir=/var/tmp \
@@ -273,7 +283,7 @@ fi
 
 %post pop3
 /sbin/chkconfig --add courier-pop3
-/sbin/chkconfig --del courier-imap-pop3 2>&1 >/dev/null
+/sbin/chkconfig --del courier-imap-pop3 >/dev/null 2>&1 || :
 if [ -f /var/lock/subsys/courier-imap-pop3 ]; then
        /etc/rc.d/init.d/courier-imap-pop3 stop >&2
        /etc/rc.d/init.d/courier-pop3 start >&2
@@ -293,7 +303,7 @@ if [ "$1" = "0" ]; then
        if [ -f /var/lock/subsys/courier-imap-pop3 ]; then
                /etc/rc.d/init.d/courier-imap-pop3 stop >&2
        fi
-       /sbin/chkconfig --del courier-imap-pop3 2>&1 >/dev/null
+       /sbin/chkconfig --del courier-imap-pop3 >/dev/null 2>&1 || :
        rm -f /etc/rc.d/init.d/courier-imap-pop3
 fi
 
@@ -310,11 +320,13 @@ fi
 
 %preun authldap
 METHOD=plain
-. /etc/sysconfig/authdaemon
-if [ "$1" = "$0" -a "$METHOD" = "ldap" ]; then
-       if [ -f /var/lock/subsys/authdaemon ]; then
-               /etc/rc.d/init.d/authdaemon stop >&2
-       fi
+if [ -e /etc/sysconfig/authdaemon ]; then
+    . /etc/sysconfig/authdaemon
+    if [ "$1" = "$0" -a "$METHOD" = "ldap" ]; then
+           if [ -f /var/lock/subsys/authdaemon ]; then
+                   /etc/rc.d/init.d/authdaemon stop >&2
+           fi
+    fi
 fi
 
 %post authmysql
@@ -330,13 +342,37 @@ fi
 
 %preun authmysql
 METHOD=plain
+if [ -e /etc/sysconfig/authdaemon ]; then
+    . /etc/sysconfig/authdaemon
+    if [ "$1" = "$0" -a "$METHOD" = "mysql" ]; then
+           if [ -f /var/lock/subsys/authdaemon ]; then
+                   /etc/rc.d/init.d/authdaemon stop >&2
+           fi
+    fi
+fi
+
+%post authpgsql
+METHOD=plain
 . /etc/sysconfig/authdaemon
-if [ "$1" = "$0" -a "$METHOD" = "mysql" ]; then
+if [ "$METHOD" = "pgsql" ]; then
        if [ -f /var/lock/subsys/authdaemon ]; then
-               /etc/rc.d/init.d/authdaemon stop >&2
+               /etc/rc.d/init.d/authdaemon restart >&2
+       else
+               echo "Run \"/etc/rc.d/init.d/authdaemon start\" to start courier-imap authdaemon."
        fi
 fi
 
+%preun authpgsql
+METHOD=plain
+if [ -e /etc/sysconfig/authdaemon ]; then
+    . /etc/sysconfig/authdaemon
+    if [ "$1" = "$0" -a "$METHOD" = "pgsql" ]; then
+           if [ -f /var/lock/subsys/authdaemon ]; then
+                   /etc/rc.d/init.d/authdaemon stop >&2
+           fi
+    fi
+fi
+
 %files
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/imap
@@ -372,6 +408,7 @@ fi
 %{_mandir}/man8/authp[aw]*
 %{_mandir}/man7/authlib*
 %{_mandir}/man1/couriert*
+%{_mandir}/man8/couriert*
 %{_mandir}/man8/mk*
 
 %files userdb