--- rpms/smeserver-dovecot/sme10/smeserver-dovecot.spec	2020/12/07 06:33:13	1.15
+++ rpms/smeserver-dovecot/sme10/smeserver-dovecot.spec	2021/03/16 20:34:59	1.21
@@ -1,5 +1,5 @@
 %define version 1.6.0
-%define release 13
+%define release 18
 %define name smeserver-dovecot
 
 
@@ -44,6 +44,22 @@ Configure the dovecot IMAP server with s
 quota, ACL, extended logging, master user
 
 %changelog
+* Tue Mar 16 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.6.0-18.sme
+- clean rsyslog syntax for dovecot [SME: 11422]
+
+* Sat Jan 02 2021 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-17.sme
+- add Restart=always [SME: 11101]
+
+* Mon Dec 14 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-16.sme
+- fix path for event -update [SME: 11101]
+
+* Tue Dec 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-15.sme
+- cleanup /var/service/dovecot [SME: 11101]
+  close logger and service from previous runit instance before starting systemd one
+
+* Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-14.sme
+- add systemd drop-in expand in bootstrap-console-save, console-save, post-install, post-upgrade  [SME: 11101]
+
 * Sun Dec 06 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-13.sme
 - move service to systemd [SME: 11101]
 - add imap idle notify interval setting [SME: 10947]
@@ -179,9 +195,6 @@ perl createlinks
 /bin/rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
    --file /sbin/e-smith/systemd/dovecot-control 'attr(0554,root,root)'\
-   --file /var/service/dovecot/run 'attr(0755,root,root)' \
-   --file /var/service/dovecot/log/run 'attr(0755,root,root)' \
-   --file /var/service/dovecot/control/1 'attr(0755,root,root)' \
    --dir /var/log/dovecot 'attr(0750,smelog,smelog)' \
   > %{name}-%{version}-filelist
 
@@ -191,8 +204,24 @@ perl createlinks
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %pre
+if [ $1 -gt 1 ] ; then
+  if [ -e /var/service/dovecot/run ] ; then
+        /usr/bin/sv d dovecot
+        /usr/bin/sv d dovecot/log
+  fi
+  if [ -e /var/service/dovecot ] ; then
+        rm -rf /var/service/dovecot
+  fi
+  if [ -e /var/service/pop3 ] ; then
+        rm -rf /var/service/pop3
+  fi
+  if [ -e /var/service/pop3s ] ; then
+        rm -rf /var/service/pop3s
+  fi
 
+fi
 %post
 
 %preun