From eed6bdbfd6819dd1eda74a0278f01b9f88d9ff2f Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Fri, 9 Oct 2009 19:01:08 +0000
Subject: [PATCH] - fix init script for case when no action was specified

---
 .cvsignore   | 2 +-
 dovecot.init | 4 ++--
 dovecot.spec | 7 +++++--
 sources      | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6d1b58a..2266038 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
 dovecot-1.2.6.tar.gz
 dovecot-1.2-managesieve-0.11.9.tar.gz
-dovecot-1.2.5-managesieve-0.11.9.diff.gz
+dovecot-1.2.6-managesieve-0.11.9.diff.gz
 dovecot-1.2-sieve-0.1.12.tar.gz
diff --git a/dovecot.init b/dovecot.init
index e694da0..8ba796a 100755
--- a/dovecot.init
+++ b/dovecot.init
@@ -98,8 +98,8 @@ case "$1" in
 	;;
   *)
 	echo $"Usage: $0 {condrestart|try-restart|start|stop|restart|reload|force-reload|status}"
-	[ $1 = 'usage' ] && exit 0
-	exit 2
+	RETVAL=2
+	[ "$1" = 'usage' ] && RETVAL=0
 esac
 
 exit $RETVAL
diff --git a/dovecot.spec b/dovecot.spec
index a2e76e5..0195f96 100644
--- a/dovecot.spec
+++ b/dovecot.spec
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT and LGPLv2 and BSD with advertising
 Group: System Environment/Daemons
 
@@ -31,7 +31,7 @@ Source7: dovecot-REDHAT-FAQ.txt
 Source8: http://www.rename-it.nl/dovecot/1.2/%{sieve_name}-%{sieve_version}.tar.gz
 Source9: dovecot.sysconfig
 Source10: http://www.rename-it.nl/dovecot/1.2/%{managesieve_name}-%{managesieve_version}.tar.gz
-Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.5-managesieve-%{managesieve_version}.diff.gz
+Source11: http://www.rename-it.nl/dovecot/1.2/dovecot-1.2.6-managesieve-%{managesieve_version}.diff.gz
 
 # 3x Fedora specific
 Patch1: dovecot-1.1-default-settings.patch
@@ -435,6 +435,9 @@ fi
 
 
 %changelog
+* Fri Oct 09 2009 Michal Hlavinka <mhlavink@redhat.com> - 1:1.2.6-2
+- fix init script for case when no action was specified
+
 * Tue Oct 06 2009 Michal Hlavinka <mhlavink@redhat.com> - 1:1.2.6-1
 - dovecot updated to 1.2.6
 - Added authtest utility for doing passdb and userdb lookups.
diff --git a/sources b/sources
index 51df552..33d5285 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 807666f1a112e7379c4dbb57c9ce4899  dovecot-1.2.6.tar.gz
 923d4965e0b357db493f3b2cb106d8d7  dovecot-1.2-managesieve-0.11.9.tar.gz
-22639d0bc4ff424282bd3f8fe8db9ab5  dovecot-1.2.5-managesieve-0.11.9.diff.gz
+615d5d1ad843654384ca11cf523c2bbc  dovecot-1.2.6-managesieve-0.11.9.diff.gz
 8749f26606c4563f0676bacc44e89ca2  dovecot-1.2-sieve-0.1.12.tar.gz