- updated to 3.0.3

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

diff --git a/courier-imap.spec b/courier-imap.spec
index 4f8eb3707cb254217a60e6b8513a67e5e418551d..c62e33b8364adaed449ef1658367ec1a01348b65 100644 (file)
--- a/courier-imap.spec
+++ b/courier-imap.spec
@@ -1,17 +1,17 @@
 #
 # Conditional build:
-%bcond_with ldap       # without LDAP support
-%bcond_with mysql      # without MySQL support
-%bcond_with pgsql      # without PostgreSQL support
+%bcond_without ldap    # without LDAP support
+%bcond_without mysql   # without MySQL support
+%bcond_without pgsql   # without PostgreSQL support
 Summary:       Courier-IMAP server
 Summary(pl):   Serwer Courier-IMAP
 Name:          courier-imap
-Version:       2.1.2
+Version:       3.0.3
 Release:       1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
-# Source0-md5: d77ef5d3c90fd0a70b333a44e0ead0a2
+# Source0-md5: 6a882a12b5d94ab0b2b22f9ef56a9b9f
 Source1:       %{name}.init
 Source2:       %{name}-pop3.init
 Source3:       %{name}-authdaemon.init
@@ -20,14 +20,16 @@ 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
 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
+BuildRequires: openssl-devel >= 0.9.7d
 %{?with_pgsql:BuildRequires:   postgresql-devel}
+BuildRequires: sysconftool
 %{?with_mysql:BuildRequires:   zlib-devel}
 PreReq:                %{name}-common = %{version}
 PreReq:                rc-scripts
@@ -105,7 +107,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 +126,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 +138,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 +151,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 +162,15 @@ IMAP.
 
 %prep
 %setup -q
-#%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 \
@@ -233,6 +241,10 @@ echo ".so makeuserdb.8"    >$RPM_BUILD_ROOT%{_mandir}/man8/vchkpw2userdb.8
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.{pop3,imap}
 
+# remove unpackaged files
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/*.dist
+rm -f $RPM_BUILD_ROOT%{_libexecdir}/*.rc
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -273,7 +285,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 +305,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 +322,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,25 +344,55 @@ 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)
+%doc maildir/README.sharedfolders.html
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/imap
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/security/blacklist.imap
 %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/courier-imap
 %attr(754,root,root) /etc/rc.d/init.d/courier-imap
 %{_sysconfdir}/imapd.cnf
 %attr(755,root,root) %{_bindir}/imapd
+%attr(755,root,root) %{_bindir}/maildiracl
 %attr(755,root,root) %{_bindir}/maildirkw
+%attr(755,root,root) %{_sbindir}/authenumerate
 %attr(755,root,root) %{_sbindir}/imaplogin
 %attr(755,root,root) %{_sbindir}/mkimapdcert
+%attr(755,root,root) %{_sbindir}/sharedindexinstall
+%attr(755,root,root) %{_sbindir}/sharedindexsplit
 %{_mandir}/man8/imapd*
+%{_mandir}/man1/maildiracl.1*
 %{_mandir}/man1/maildirkw.1*
 
 %files common
@@ -364,14 +408,16 @@ fi
 %{_sysconfdir}/quotawarnmsg.example
 %attr(755,root,root) %{_bindir}/couriertls
 %attr(755,root,root) %{_libexecdir}/authlib/authdaemon
+%attr(755,root,root) %{_libexecdir}/authlib/authdaemond
 %attr(755,root,root) %{_libexecdir}/authlib/authdaemond.plain
 %attr(755,root,root) %{_libexecdir}/couriertcpd
-%attr(755,root,root) %{_libexecdir}/courierlogger
 %attr(755,root,root) %{_libexecdir}/makedatprog
+%attr(755,root,root) %{_sbindir}/courierlogger
 %{_mandir}/man8/auth[cdsuv]*
 %{_mandir}/man8/authp[aw]*
 %{_mandir}/man7/authlib*
 %{_mandir}/man1/couriert*
+%{_mandir}/man8/couriert*
 %{_mandir}/man8/mk*
 
 %files userdb