--- rpms/smeserver-dovecot/sme9/smeserver-dovecot.spec	2013/02/26 18:53:22	1.1
+++ rpms/smeserver-dovecot/sme9/smeserver-dovecot.spec	2013/06/23 19:55:25	1.16
@@ -1,5 +1,5 @@
 %define version 1.4.0
-%define release 1
+%define release 14
 %define name smeserver-dovecot
 
 
@@ -10,6 +10,11 @@ Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
+Patch1: smeserver-dovecot-1.4.0-remove_acl_and_sieve.patch
+Patch2: smeserver-dovecot-1.4.0-remove_obsolete_changelog.patch
+Patch3: smeserver-dovecot-1.4.0-allow_plaintext.patch
+Patch4: smeserver-dovecot-1.4.0-imapd_pem_perm.patch
+Patch5: smeserver-dovecot-1.4.0-listen_loopback.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
@@ -17,17 +22,63 @@ BuildRequires: e-smith-devtools
 
 Requires: e-smith-base >= 5.2.0
 Requires: dovecot >= 2.0.9
-Requires: dovecot-pigeonhole >= 2.0.9
-Requires: acl
 
 Provides: e-smith-imap
 Obsoletes: e-smith-imap
+Obsoletes: e-smith-ssl-imap
+Obsoletes: e-smith-wu-imap
+Obsoletes: imap
+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
+* Sun Jun 23 2013 Daniel Berteaud <daniel@firewall-services.com> - 1.4.0-14.sme
+- Listen on loopback if disabled [SME: 7697]
+
+* Wed May 29 2013  chris burnat <devlist@burnat.com> - 1.4.0-13.sme
+- Reverse changes made in 1.4.0-12 [SME: 7597]
+
+* Fri May 24 2013  chris burnat <devlist@burnat.com> - 1.4.0-12.sme
+- Fix IMAP folders dont present correctly in Outlook 2007 [SME: 7597]
+
+* Sat May 18 2013  Daniel Berteaud <daniel@firewall-services.com> - 1.4.0-11.sme
+- Fix permissions on imapd.pem as it's used by pop3s [SME: 7570]
+
+* Wed Apr 24 2013 Daniel Berteaud <daniel@firewall-services.com> - 1.4.0-10.sme
+- Do not obsolete bglibs, it's required for cvm [SME: 7509]
+
+* Tue Apr 16 2013 Daniel Berteaud <daniel@firewall-services.com> - 1.4.0-9.sme
+- Allow plaintext (unless explicitly disabled) [SME: 7549]
+
+* Wed Apr 10 2013 Daniel Berteaud <daniel@firewall-services.com> - 1.4.0-8.sme
+- Do not obsolete cvm, it's still needed for qpsmtpd [SME: 7509]
+
+* Thu Feb 28 2013 Shad L. Lords <slords@mail.com> - 1.4.0-7.sme
+- Obsolete another el5 required by requires [SME: 7273]
+
+* Thu Feb 28 2013 Shad L. Lords <slords@mail.com> - 1.4.0-6.sme
+- Fix Obsolete el5 mailfront version [SME: 7273]
+
+* Thu Feb 28 2013 Shad L. Lords <slords@mail.com> - 1.4.0-5.sme
+- Obsolete el5 packages that were required by old requires [SME: 7273]
+
+* Thu Feb 28 2013 Shad L. Lords <slords@mail.com> - 1.4.0-4.sme
+- Obsolete older requires that are no longer needed [SME: 7273]
+
+* Thu Feb 28 2013 Shad L. Lords <slords@mail.com> - 1.4.0-3.sme
+- Remove requires for packages no longer needed [SME: 7405]
+
+* Thu Feb 28 2013 Daniel Berteaud <daniel@firewall-services.com> - 1.4.0-2.sme
+- remove the IMAP acl and Sieve support [SME: 7405]
+- remove obsolete changelog (used in my previous buildsys)
+
 * Tue Feb 26 2013 Daniel Berteaud <daniel@firewall-services.com> - 0.1.1-1
 - store sharedmailbox dict file in /home/e-smith/db/dovecot
 
@@ -39,6 +90,11 @@ quota, ACL, extended logging, master use
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks
@@ -52,9 +108,6 @@ perl createlinks
    --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)' \
-   --dir /home/e-smith/db/dovecot '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)' \
   > %{name}-%{version}-filelist
 
 %files -f %{name}-%{version}-filelist
@@ -64,7 +117,6 @@ perl createlinks
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/groupadd -g 439 sharedmailbox 2> /dev/null || :
 
 %post