--- rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/05/16 10:19:41	1.23
+++ rpms/smeserver-qpsmtpd/sme10/smeserver-qpsmtpd.spec	2016/06/07 06:51:42	1.26
@@ -1,10 +1,10 @@
-# $Id: smeserver-qpsmtpd.spec,v 1.22 2016/05/07 06:56:27 vip-ire Exp $
+# $Id: smeserver-qpsmtpd.spec,v 1.25 2016/05/27 06:37:29 vip-ire Exp $
 
 Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 2.6.0
-%define release 22
+%define release 25
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -36,6 +36,8 @@ Patch22: smeserver-qpsmtpd-2.6.0-dmarc_r
 Patch23: smeserver-qpsmtpd-2.6.0-spf_reject_policy.patch
 Patch24: smeserver-qpsmtpd-2.6.0-fix_syntax_in_print_dns.patch
 Patch25: smeserver-qpsmtpd-2.6.0-set_dkim_option_after_key.patch
+Patch26: smeserver-qpsmtpd-2.6.0-remove_o_and_r_dkim_fields.patch
+Patch27: smeserver-qpsmtpd-2.6.0-missing_default_props.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: qpsmtpd >= 0.96
 Requires: perl(Mail::DKIM)
@@ -69,6 +71,16 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
+* Tue Jun 7 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-25.sme
+- Add missing tnef2mime and MaximumDateOffset to qpsmtpd [SME: 9560]
+
+* Fri May 27 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-24.sme
+- Create missing directories for DKIM keys [SME: 9496]
+- Create missing directory for the DMARC report database [SME: 9206]
+
+* Tue May 24 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-23.sme
+- Remove o and r DKIM fields as they are not standard [SME: 9496]
+
 * Mon May 16 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-22.sme
 - In qpsmtpd-print-dns set DKIM options after the public key so the string
   will still be splitted correctly [SME: 9496]
@@ -853,10 +865,15 @@ SME Server qpsmtpd smtpd module
 %patch23 -p1
 %patch24 -p1
 %patch25 -p1
+%patch26 -p1
+%patch27 -p1
 
 %build
 perl createlinks
 mkdir -p root/var/lib/qpsmtpd/karma
+mkdir -p root/var/lib/qpsmtpd/dmarc
+mkdir -p root/home/e-smith/dkim_keys/default
+mkdir -p root/var/service/qpsmtpd/config/dkim
 
 PEERS_CONFIG=root/etc/e-smith/templates/var/service/qpsmtpd/config/peers
 mkdir -p $PEERS_CONFIG/0