--- rpms/smeserver-dovecot/sme10/smeserver-dovecot.spec	2020/12/07 04:49:02	1.13
+++ rpms/smeserver-dovecot/sme10/smeserver-dovecot.spec	2020/12/14 07:21:57	1.19
@@ -1,5 +1,5 @@
 %define version 1.6.0
-%define release 13
+%define release 16
 %define name smeserver-dovecot
 
 
@@ -16,6 +16,8 @@ Patch1: smeserver-dovecot-1.6.0-pop3.pat
 Patch2: smeserver-dovecot-1.6.0-bz10934-Ciphers-and-TLS.patch
 Patch3: smeserver-dovecot-1.6.0-bz9865-use-email-to-auth.patch
 Patch4: smeserver-dovecot-1.6.0-fix-createlinks-1.patch
+Patch5: smeserver-dovecot-1.6.0-bz11101-systemd.patch
+Patch6: smeserver-dovecot-1.6.0-bz10947-idle_notify.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -42,8 +44,19 @@ Configure the dovecot IMAP server with s
 quota, ACL, extended logging, master user
 
 %changelog
+* 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]
 
 * Mon May 04 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.6.0-12.sme
 - fix typo in enabling TLSv1.2 as default [SME: 10934]
@@ -160,10 +173,12 @@ quota, ACL, extended logging, master use
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 rm -rf root/var/service
 mkdir -p root/etc/dovecot/ssl
 mkdir -p root/usr/lib/systemd/system/dovecot.service.d
 mkdir -p root/etc/e-smith/templates/usr/lib/systemd/system/dovecot.service.d/50koozali.conf
+%patch6 -p1
 
 %build
 perl createlinks
@@ -186,8 +201,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