From bcb6f8122f2b77fecef46171f8a25159159bd400 Mon Sep 17 00:00:00 2001
From: Michal Hlavinka <mhlavink@fedoraproject.org>
Date: Nov 06 2009 13:13:38 +0000
Subject: - fix sourcing of /etc/sysconfig/cyrus-imapd (#533320)


---

diff --git a/cyrus-imapd.init b/cyrus-imapd.init
index fcad53e..214e435 100644
--- a/cyrus-imapd.init
+++ b/cyrus-imapd.init
@@ -20,8 +20,8 @@ lockfile=/var/lock/subsys/cyrus-imapd
 pidfile=/var/run/cyrus-master.pid
 prog="cyrus-imapd"
 
-if [ -f /etc/sysconfig/dovecot ]; then
-    . /etc/sysconfig/dovecot
+if [ -f /etc/sysconfig/$prog ]; then
+    . /etc/sysconfig/$prog
 fi
 
 # check if the config files are present
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 9675033..c2f3eae 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.3.15
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # ********************** BUILD TIME OPTIONS START **********************
 
@@ -736,6 +736,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Fri Nov 06 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.15-4
+- fix sourcing of /etc/sysconfig/cyrus-imapd (#533320)
+
 * Thu Nov 05 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.15-3
 - do not fill logs with mail (de)compression messages (#528093)