--- rpms/e-smith-qmail/sme8/e-smith-qmail.spec	2007/06/12 19:27:28	1.1
+++ rpms/e-smith-qmail/sme8/e-smith-qmail.spec	2013/06/29 18:13:34	1.16
@@ -1,23 +1,22 @@
+# $Id: e-smith-qmail.spec,v 1.15 2013/05/23 04:45:06 burnat Exp $
+
 Summary: startup scripts for Dan Bernstein's qmail package
 %define name e-smith-qmail
 Name: %{name}
-%define version 1.10.0
-%define release 13
+%define version 2.2.0
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-qmail-1.10.0.no_connect_zero.patch
-Patch1: e-smith-qmail-1.10.0-update-groups.patch
-Patch2: e-smith-qmail-1.10.0-DomainMailOnly.patch
-Patch3: e-smith-qmail-1.10.0-MailRouting.patch 
-Patch4: e-smith-qmail-1.10.0-MaxMessageSize.patch
-Patch5: e-smith-qmail-1.10.0-helohost.patch
-Patch6: e-smith-qmail-1.10.0-ExcludeFromEveryoneEmail.patch
-Patch7: e-smith-qmail-1.10.0-forcejunkmaildir.patch
-Patch8: e-smith-qmail-1.10.0-qmailadmin.patch
-Patch9: e-smith-qmail-1.10.0-sv.patch
+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
+Patch6: e-smith-qmail-2.2.0-modify_domain_style_pseudonyms.patch
+Patch7: e-smith-qmail-2.2.0-modify_domain_style_pseudonyms_dot_in_name.patch
+Patch8: e-smith-qmail-2.2.0-Concurrency.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.13.0-04
 BuildArchitectures: noarch
@@ -26,13 +25,57 @@ 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
+* Sat Jun 29 2013 Ian Wells <esmith@wellsi.com> 2.2.0-11.sme
+- Simplify qmail concurrency templates[SME: 7718]
+
+* Wed May 22 2013 chris burnat <devlist@burnat.com> 2.2.0-10.sme
+- Modify domain style pseudonym pointing to user with dot in name, by Filippo Carletti [SME: 7607]
+
+* Thu May 09 2013 chris burnat <devlist@burnat.com> 2.2.0-9.sme
+- Reverse change in Template Qmail MaxMessageSize [SME: 6798]
+
+* Wed May 01 2013 chris burnat <devlist@burnat.com> 2.2.0-8.sme
+- modify domain style pseudonyms to point to the correct user, by Filippo Carletti [SME: 7055]
+
+* 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]
+
+* Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 1.10.0-16
+- Create tcpto lockfile in run script [SME: 3055]
+
+* Wed Jan 09 2008 Stephen Noble <support@dungog.net> 1.10.0-15
+- Domain catchall Redirection to Account [SME:1922]
+
+* Thu Sep  6 2007 Charlie Brady <charlie_brady@mitel.com>
+- Apply a code tidyup patch from Gordon. [SME: 871]
+
 * Sun Apr 29 2007 Shad L. Lords <slords@mail.com>
 - Clean up spec so package can be built by koji/plague
 
@@ -304,12 +347,9 @@ Startup scripts for Dan Bernstein's qmai
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 
 %build
 perl createlinks