--- rpms/smeserver-qpsmtpd/sme7/smeserver-qpsmtpd.spec	2008/01/10 20:18:33	1.15
+++ rpms/smeserver-qpsmtpd/sme7/smeserver-qpsmtpd.spec	2008/07/24 18:18:07	1.19
@@ -2,7 +2,7 @@ Summary: SME Server qpsmtpd module
 %define name smeserver-qpsmtpd
 Name: %{name}
 %define version 1.2.1
-%define release 52
+%define release 55
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -50,6 +50,8 @@ Patch38: smeserver-qpsmtpd-1.2.1-templat
 Patch39: smeserver-qpsmtpd-1.2.1-qplogsummStatus.patch
 Patch40: smeserver-qpsmtpd-1.2.1-logdebug.patch
 Patch41: smeserver-qpsmtpd-1.2.1-dividezerofix.patch
+Patch42: smeserver-qpsmtpd-1.2.1-rblsbl.patch3
+Patch43: smeserver-qpsmtpd-1.2.1-FixDisclaimerEmptyLines.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: qpsmtpd >= 0.40
 Requires: perl(Mail::DKIM)
@@ -80,19 +82,29 @@ AutoReqProv: no
 SME Server qpsmtpd smtpd module
 
 %changelog
-* Thu Jan 10 2008 Gavin Weight <gweight@gmail.com>1.2.1-52
+* Wed Jul 23 2008 Gavin Weight <gweight@gmail.com> 1.2.1-55
+- Fix empty lines and add feature to specify disclaimer directory.
+  (thanks, Federico Simoncelli). [SME: 3244]
+
+* Thu Apr 17 2008 Gavin Weight <gweight@gmail.com> 1.2.1-54
+- Migrate ordb.net entries away. [SME: 4214]
+
+* Tue Jan 29 2008 Filippo Carletti <filippo.carletti@gmail.com> 1.2.1-53
+- Enable auth plugin for local connections. [SME: 2631]
+
+* Thu Jan 10 2008 Gavin Weight <gweight@gmail.com> 1.2.1-52
 - Fix divide by zero error on log rotate. [SME: 3620]
 
-* Wed Jan 09 2008 Stephen Noble <support@dungog.net>1.2.1-51
+* Wed Jan 09 2008 Stephen Noble <support@dungog.net> 1.2.1-51
 - check_smtp_forward changed from loginfo to logdebug [SME: 3471]
 
 * Mon Jan 7 2008 Stephen Noble <support@dungog.net> 1.2.1-50
-- disable qplogsumm by deafult [SME: 2333]
+- disable qplogsumm by deafult [SME: 3727]
 
 * Mon Jan 7 2008 Stephen Noble <support@dungog.net> 1.2.1-49
 - rename template-begin fragments [SME: 2333]
 
-* Mon Oct 29 2007 Charlie Brady <charlie_brady@mitel.com>
+* Mon Oct 29 2007 Charlie Brady <charlie_brady@mitel.com> 1.2.1-48
 - Add badrcptto_pattern rule to block "null" recipient addresses.
   [SME: 3476]
 
@@ -694,6 +706,8 @@ SME Server qpsmtpd smtpd module
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
+%patch42 -p1
+%patch43 -p1
 
 %build
 perl createlinks
@@ -727,7 +741,6 @@ mkdir -p $PEERS_CONFIG/0
 mkdir -p $PEERS_CONFIG/local
 
 DISABLE_LOCAL="
-05auth_cvm_unix_local
 10check_earlytalker
 12count_unrecognized_commands
 16require_resolvable_fromhost