- update post,preun; fix certsdir perm; rel.1

[packages/courier.git] / courier.spec

diff --git a/courier.spec b/courier.spec
index a09e1ff53e5e83030ebc7da4ff181ff286169142..3b0d1f2017e08f39a0c33161d11d77a4b636b2cc 100644 (file)
--- a/courier.spec
+++ b/courier.spec
@@ -6,7 +6,7 @@ Summary:        Courier mail server
 Summary(pl):   Serwer poczty Courier
 Name:          courier
 Version:       0.45.5
-Release:       0.6
+Release:       1
 License:       GPL
 Group:         Networking/Daemons
 Source0:       http://dl.sourceforge.net/courier/%{name}-%{version}.tar.bz2
@@ -591,10 +591,20 @@ if [ -e %{_localstatedir}/tmp/imapd.pid ]; then
     %{_sbindir}/imapd stop
     %{_sbindir}/imapd start
 fi
+else
+echo
+echo Type "%{_sbindir}/imapd start" to start imapd server
+echo
+fi
 if [ -e %{_localstatedir}/tmp/imapd-ssl.pid ]; then
     %{_sbindir}/imapd-ssl stop
     %{_sbindir}/imapd-ssl start
 fi
+else
+echo
+echo Type "%{_sbindir}/imapd-ssl start" to start imapd-ssl server
+echo
+fi
 
 %preun imapd
 if [ "$1" = "0" ]; then
@@ -611,10 +621,20 @@ if [ -e %{_localstatedir}/tmp/pop3d.pid ]; then
     %{_sbindir}/pop3d stop
     %{_sbindir}/pop3d start
 fi
+else
+echo
+echo Type "%{_sbindir}/pop3d start" to start pop3d server
+echo
+fi
 if [ -e %{_localstatedir}/tmp/pop3d-ssl.pid ]; then
     %{_sbindir}/pop3d-ssl stop
     %{_sbindir}/pop3d-ssl start
 fi
+else
+echo
+echo Type "%{_sbindir}/pop3d-ssl start" to start pop3d-ssl server
+echo
+fi
 
 %preun pop3d
 if [ "$1" = "0" ]; then
@@ -640,19 +660,19 @@ echo If you want to have calendar starting by default then
 echo put word net to %{_sysconfdir}/calendarmode
 echo
 fi
-if ps -A |grep -q sqwebmaild; then
-    %{_libdir}/courier/sqwebmaild stop
-    %{_libdir}/courier/sqwebmaild start
+if [ -e %{_localstatedir}/tmp/sqwebmaild.pid ]; then
+    %{_sbindir}/webmaild stop
+    %{_sbindir}/webmaild start
 else
 echo
-echo Type "%{_libdir}/courier/sqwebmaild start" to start webmail server
+echo Type "%{_sbindir}/webmaild start" to start webmail server
 echo
 fi
 
 %preun webmail
 if [ "$1" = "0" ]; then
-    if ps -A |grep -q sqwebmaild; then
-       %{_libdir}/courier/sqwebmaild stop
+    if [ -e %{_localstatedir}/tmp/sqwebmaild.pid ]; then
+       %{_sbindir}/webmaild stop
     fi
 fi
 
@@ -784,7 +804,7 @@ fi
 %{_mandir}/man8/pw2userdb.8*
 %{_mandir}/man8/vchkpw2userdb.8*
 %dir %{_sysconfdir}
-%attr(750,root,root) %dir %{_certsdir}
+%attr(750,daemon,root) %dir %{_certsdir}
 %attr(755,daemon,daemon) %dir %{_sysconfdir}/hosteddomains
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/me
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/ldapaddressbook