--- rpms/smeserver-dovecot/sme10/smeserver-dovecot.spec	2020/12/08 20:24:26	1.17
+++ rpms/smeserver-dovecot/sme10/smeserver-dovecot.spec	2023/08/14 16:39:25	1.23
@@ -1,5 +1,5 @@
 %define version 1.6.0
-%define release 15
+%define release 20
 %define name smeserver-dovecot
 
 
@@ -18,6 +18,7 @@ Patch3: smeserver-dovecot-1.6.0-bz9865-u
 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
+Patch7: smeserver-dovecot-1.6.0-bz11601-ssl-templated.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -37,13 +38,27 @@ Obsoletes: m4 <= 1.4.5
 Obsoletes: mailfront <= 1.10
 Obsoletes: stunnel <= 4.15
 Obsoletes: stunnel-tls <= 3.22
-Obsoletes: words <= 3.0
 
 %description
 Configure the dovecot IMAP server with sieve scripts support,
 quota, ACL, extended logging, master user
 
 %changelog
+* Mon Aug 14 2023 Jean-Philippe Pialasse <tests@pialasse.com> 1.6.0-20.sme
+- remove obsoletes word as it prevents unrelated packages to install [SME: 12393]
+
+* Sun May 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.6.0-19.sme
+- ssl pem update via template expand in place of copy [SME: 11601]
+
+* 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
@@ -176,6 +191,7 @@ 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
+%patch7 -p1
 
 %build
 perl createlinks
@@ -186,9 +202,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
 
@@ -208,6 +221,12 @@ if [ $1 -gt 1 ] ; then
   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