[cyrus-imapd] fixed: systemd commands in %post (thanks Bill Nottingham)

Michal Hlavinka mhlavink at fedoraproject.org
Mon May 9 11:39:48 UTC 2011


commit a1eec5a1e5fc03f4feeb62ce8ef13ce4ddada71d
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Mon May 9 13:39:37 2011 +0200

    fixed: systemd commands in %post (thanks Bill Nottingham)

 cyrus-imapd.spec |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index a832ea7..a897941 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -1,6 +1,6 @@
 Name: cyrus-imapd
 Version: 2.4.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
 
@@ -301,10 +301,7 @@ rm -rf %{buildroot}
   -G saslauth -s /sbin/nologin -u %{uid} -r %{_cyrususer} 2> /dev/null || :
 
 %post
-/sbin/service cyrus-imapd condrestart >/dev/null 2>&1 ||:
-if [ $1 -eq 1 ]; then
-        /bin/systemctl enable cyrus-imapd.service >/dev/null 2>&1 || :
-fi
+/bin/systemctl daemon-reload > /dev/null 2>&1 :
 
 # Force synchronous updates, usually only on ext2 filesystems
 for i in %{_var}/lib/imap/{user,quota} %{_var}/spool/imap
@@ -349,8 +346,8 @@ if [ $1 -ge 1 ] ; then
         /bin/systemctl try-restart cyrus-imapd.service >/dev/null 2>&1 || :
 fi
 
-%triggerun -- smartmontools < 2.4.7-2
-/sbin/chkconfig smartd && /bin/systemctl enable smartd.service >/dev/null 2>&1 || :
+%triggerun -- cyrus-imapd < 2.4.7-2
+/sbin/chkconfig --level 3 cyrus-imapd && /bin/systemctl enable cyrus-imapd.service >/dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root,-)
@@ -489,6 +486,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon May 09 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.4.8-2
+- fixed: systemd commands in %%post (thanks Bill Nottingham)
+
 * Thu Apr 14 2011 Michal Hlavinka <mhlavink at redhat.com> - 2.4.8-1
 - cyrus-imapd updated to 2.4.8
 - fixed: cannot set unlimited quota through proxy


More information about the scm-commits mailing list