--- rpms/e-smith-qmail/sme8/e-smith-qmail.spec	2008/10/07 19:15:56	1.5
+++ rpms/e-smith-qmail/sme8/e-smith-qmail.spec	2013/02/22 06:02:06	1.12
@@ -1,15 +1,21 @@
-# $Id$
+# $Id: e-smith-qmail.spec,v 1.11 2012/01/16 16:21:30 wellsi Exp $
 
 Summary: startup scripts for Dan Bernstein's qmail package
 %define name e-smith-qmail
 Name: %{name}
 %define version 2.2.0
-%define release 1
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
+Patch0: e-smith-qmail-2.2.0_no-workaround.patch
+Patch1: e-smith-qmail-2.2.0-IncorrectUseOfBrackets.patch
+Patch2: e-smith-qmail-2.2.0-IncorrectUseOfBrackets2.patch
+Patch3: e-smith-qmail-2.2.0-configure_number_of_log_files_to_keep.patch.patch
+Patch4: e-smith-qmail-2.2.0-DotGroupFix.patch
+Patch5: e-smith-qmail-2.2.0-MaxMessageSize.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.13.0-04
 BuildArchitectures: noarch
@@ -18,13 +24,33 @@ Requires: dot-forward
 Requires: fastforward
 Requires: runit
 Requires: e-smith-email
-Requires: qmail-workaround
+Requires: qmail >= 1.03-17
 Provides: e-smith-mta
 Conflicts: runit < 1.7
 Obsoletes: qmail-initscripts
+Obsoletes: qmail-workaround
 AutoReqProv: no
 
 %changelog
+* Thu Feb 21 2013 Ian Wells <esmith@wellsi.com> 2.2.0-7.sme
+- Template Qmail MaxMessageSize [SME: 6798]
+
+* Sun Jan 15 2012 Ian Wells <esmith@wellsi.com> 2.2.0-6.sme
+- Allow groups with dots, by Filippo Carletti [SME: 6694]
+
+* Thu Oct 14 2010 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-5.sme
+- Read number of log files to keep from the DB [SME: 5855]
+
+* Sat Sep 05 2009 Gavin Weight <gweight@gmail.com> 2.2.0-4
+- SMTPSmartHost template incorrectly uses brackets to avoid MX lookups. [SME: 5456]
+
+* Mon May 18 2009 Gavin Weight <gweight@gmail.com> 2.2.0-3
+- smtproutes template incorrectly uses brackets to avoid MX lookups. [SME: 5257]
+
+* Tue May 12 2009 Filippo Carletti <filippo.carletti@gmail.com> 2.2.0-2
+- Remove qmail-workaround and obsolete it after patch to treat 0.0.0.0 as a 
+  local ip [SME: 5171]
+
 * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 2.2.0-1.sme
 - Roll new stream to separate sme7/sme8 trees [SME: 4633]
 
@@ -304,6 +330,12 @@ Startup scripts for Dan Bernstein's qmai
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks