--- rpms/smeserver-dovecot-extras/contribs10/smeserver-dovecot-extras.spec	2020/10/13 08:04:12	1.2
+++ rpms/smeserver-dovecot-extras/contribs10/smeserver-dovecot-extras.spec	2021/06/01 03:34:43	1.6
@@ -1,19 +1,18 @@
-%define version 0.1.1
-%define release 3
-%define name smeserver-dovecot-extras
-
-
 Summary: Additional features for dovecot on SME Server
-Name: %{name}
-Version: %{version}
-Release: %{release}%{?dist}
+Name: smeserver-dovecot-extras
+Version: 0.1.6
+Release: 4%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
+Patch0: smeserver-dovecot-extras-0.1.6-Add-update-event-to-createlinks.patch
+Patch1: smeserver-dovecot-extras-0.1.6-Fix-sieve-compile.patch
+Patch2: smeserver-dovecot-extras-0.1.6-bz11551.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
+BuildRequires: dovecot-pigeonhole
 
 Requires: smeserver-dovecot
 Requires: dovecot-pigeonhole
@@ -23,14 +22,35 @@ Requires: acl
 Add IMAP acl (sharedmailbox) and sieve capabilities to the IMAP server
 
 %changelog
-* Tue Oct 13 2020 Brian Read <brianr@bjsystems.co.uk> 0.1.1-3.sme
-- Initial Import to SME10 tree [SME: 11032]
+* Mon May 31 2021 Jean-Philippe Pialasse <tests@pialasse.com> 0.1.6-4.sme
+- move spamd entry to spamassassin [SME: 11551]
+
+* Wed Apr 07 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.6-3.sme
+- fix up sieve compile depending on whether bayes is in use [SME: 11531]
+
+* Tue Apr 06 2021 Brian Read <brianr@bjsystems.co.uk> 0.1.6-2.sme
+- Add -update event to avoid reboot on install [SME: 11032]
+
+* Thu Nov 12 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 0.1.6-1
+- New build for Koozali SME v10
+- exclude /us/bin dir
+
+* Tue Mar 27 2018 Daniel Berteaud <daniel@firewall-services.com> 0.1.5-1
+- Don't set default ACL for authenticated users (daniel@firewall-services.com)
+
+* Sun Nov 19 2017 Daniel Berteaud <daniel@firewall-services.com> 0.1.4-1
+- new package built with tito
+
+* Thu Jun 8 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.1.3-1
+- Add support for public mailboxes (patch from John H. Bennett III
+  <bennettj@thebennetthome.com>)
+- Ignore moves from junkmail to Éléments supprimés
 
-* Wed Sep 02 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 0.1.1-2.sme
-- Initial release to contribs9
+* Mon Mar 6 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.1.2-1
+- Support spam learning by moving to/from junkmail or Junk
 
 * Mon Jun 23 2014 Daniel Berteaud <daniel@firewall-services.com> - 0.1.1-1
-- Add midding /home/e-smith/db/dovecot dir
+- Add missing /home/e-smith/db/dovecot dir
 - Remove submission_host for sieve
 
 * Tue Oct 29 2013 Daniel Berteaud <daniel@firewall-services.com> - 0.0.2-1
@@ -41,10 +61,14 @@ Add IMAP acl (sharedmailbox) and sieve c
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks
 mkdir -p root/home/e-smith/db/dovecot
+mkdir -p root/home/e-smith/files/public/{cur,new,tmp}
 
 %install
 /bin/rm -rf $RPM_BUILD_ROOT
@@ -52,8 +76,15 @@ mkdir -p root/home/e-smith/db/dovecot
 /bin/rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
    --dir /home/e-smith/db/dovecot 'attr(2770,root,sharedmailbox)' \
+   --dir /home/e-smith/files/public 'attr(2770,root,sharedmailbox)' \
+   --dir /home/e-smith/files/public/cur 'attr(2770,root,sharedmailbox)' \
+   --dir /home/e-smith/files/public/new 'attr(2770,root,sharedmailbox)' \
+   --dir /home/e-smith/files/public/tmp 'attr(2770,root,sharedmailbox)' \
    --file /home/e-smith/db/dovecot/sharedmailbox.db 'attr(0660,root,sharedmailbox) %config(noreplace)' \
    --file /usr/bin/imap-postlogin 'attr(0755,root,root)' \
+   --file /usr/libexec/dovecot/learn-spam.sh 'attr(0755,root,root)' \
+   --file /usr/libexec/dovecot/learn-ham.sh 'attr(0755,root,root)' \
+   --ignoredir /usr/bin \
   > %{name}-%{version}-filelist
 
 %files -f %{name}-%{version}-filelist