- fixed shell syntax

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

diff --git a/courier-imap.spec b/courier-imap.spec
index 4f8eb3707cb254217a60e6b8513a67e5e418551d..f4782196fced17b08b43dd5a149814a57eff6908 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:       2.2.1
 Release:       1
 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,7 +20,6 @@ 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: gdbm-devel
 BuildRequires: libstdc++-devel
@@ -160,7 +159,6 @@ IMAP.
 
 %prep
 %setup -q
-#%patch0 -p1
 
 %build
 %configure \
@@ -273,7 +271,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 +291,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
 
@@ -372,6 +370,7 @@ fi
 %{_mandir}/man8/authp[aw]*
 %{_mandir}/man7/authlib*
 %{_mandir}/man1/couriert*
+%{_mandir}/man8/couriert*
 %{_mandir}/man8/mk*
 
 %files userdb