--- rpms/e-smith-qmail/sme7/e-smith-qmail.spec	2008/01/09 22:23:27	1.3
+++ rpms/e-smith-qmail/sme7/e-smith-qmail.spec	2009/09/05 14:47:16	1.8
@@ -1,25 +1,18 @@
+# $Id: e-smith-qmail.spec,v 1.7 2009/05/18 16:24:15 bytegw Exp $
+
 Summary: startup scripts for Dan Bernstein's qmail package
 %define name e-smith-qmail
 Name: %{name}
-%define version 1.10.0
-%define release 15
+%define version 2.0.0
+%define release 4
 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
-Patch10: e-smith-qmail-1.10.0-userName.patch
-Patch11: e-smith-qmail-1.10.0-catchall.patch2
+Patch0: e-smith-qmail-2.2.0_no-workaround.patch
+Patch1: e-smith-qmail-2.0.0-IncorrectUseOfBrackets.patch
+Patch2: e-smith-qmail-2.0.0-IncorrectUseOfBrackets2.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools >= 1.13.0-04
 BuildArchitectures: noarch
@@ -28,13 +21,30 @@ 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 Sep 05 2009 Gavin Weight <gweight@gmail.com> 2.0.0-4
+- SMTPSmartHost template incorrectly uses brackets to avoid MX lookups. [SME: 5455]
+
+* Mon May 18 2009 Gavin Weight <gweight@gmail.com> 2.0.0-3
+- smtproutes template incorrectly uses brackets to avoid MX lookups. [SME: 5254]
+
+* Tue May 12 2009 Filippo Carletti <filippo.carletti@gmail.com> 2.0.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.0.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]
 
@@ -311,15 +321,6 @@ Startup scripts for Dan Bernstein's qmai
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
 
 %build
 perl createlinks