rpms/dovecot/F-12 dovecot.init,1.8,1.9 dovecot.spec,1.148,1.149

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/dovecot/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6202

Modified Files:
	dovecot.init dovecot.spec 
Log Message:
* Tue Nov 24 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.8-2
- fix initdddir typo (for rhel rebuilds)
- fix dovecot's restart after update (#518753)



Index: dovecot.init
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/dovecot.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- dovecot.init	9 Oct 2009 19:03:06 -0000	1.8
+++ dovecot.init	24 Nov 2009 16:26:14 -0000	1.9
@@ -83,12 +83,14 @@ case "$1" in
 	;;
   force-reload|restart)
 	stop
+	sleep 1
 	start
 	RETVAL=$?
 	;;
   condrestart|try-restart)
 	if [ -f $lockfile ]; then
 	    stop
+	    sleep 3
 	    start
 	fi
 	;;


Index: dovecot.spec
===================================================================
RCS file: /cvs/extras/rpms/dovecot/F-12/dovecot.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- dovecot.spec	20 Nov 2009 08:43:14 -0000	1.148
+++ dovecot.spec	24 Nov 2009 16:26:14 -0000	1.149
@@ -2,7 +2,7 @@ Summary: Secure imap and pop3 server
 Name: dovecot
 Epoch: 1
 Version: 1.2.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 #dovecot itself is MIT, a few sources are PD, (manage)sieve is LGPLv2, perfect_maildir.pl is GPLv2+
 License: MIT and LGPLv2 and GPLv2+
 Group: System Environment/Daemons
@@ -22,9 +22,7 @@ Group: System Environment/Daemons
 %define managesieve_name dovecot-1.2-managesieve
 
 %if %{?fedora}00%{?rhel} < 6
-%if %{?_initdddir}
-%define _initdddir %{_initrddir}
-%endif
+%define _initddir %{_initrddir}
 %endif
 
 URL: http://www.dovecot.org/
@@ -253,7 +251,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %if %{?fedora}00%{?rhel} < 6
-sed -i 's|password-auth|system-auth|'%{SOURCE2} %if %{_initdddir}
+sed -i 's|password-auth|system-auth|' %{SOURCE2}
 %endif
 
 install -p -m 755 src/plugins/convert/convert-tool $RPM_BUILD_ROOT%{_libexecdir}/%{name}
@@ -468,6 +466,10 @@ fi
 
 
 %changelog
+* Tue Nov 24 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.8-2
+- fix initdddir typo (for rhel rebuilds)
+- fix dovecot's restart after update (#518753)
+
 * Fri Nov 20 2009 Michal Hlavinka <mhlavink at redhat.com> - 1:1.2.8-1
 - update to dovecot 1.2.8