--- rpms/e-smith-domains/sme8/e-smith-domains.spec	2008/04/26 22:37:03	1.7
+++ rpms/e-smith-domains/sme8/e-smith-domains.spec	2008/10/07 18:03:02	1.9
@@ -1,27 +1,20 @@
+# $Id$
+
 Summary: e-smith server and gateway - domains module
 %define name e-smith-domains
 Name: %{name}
-%define version 1.4.0
-%define release 11
+%define version 2.2.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-domains-1.4.0-CorpDNSpanelTextadded.patch 
-Patch1: e-smith-domains-1.4.0-CorpDNSpanelTextadded.patch2
-Patch2: e-smith-domains-1.4.0-novirtual.patch
-Patch3: e-smith-domains-1.4.0-delete_forwarder.patch
-Patch4: e-smith-domains-1.4.0-delete_forwarder.patch2
-Patch5: e-smith-domains-1.4.0-delete_forwarder.patch3
-Patch6: e-smith-domains-1.4.0-tags2general.patch
-Patch7: e-smith-domains-1.4.0-fixADD.patch
-Patch8: e-smith-domains-1.4.0-add2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.13.15-76
 Requires: perl(HTML::Tabulate) >= 0.23
-Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: perl(Test::Inline) >= 0.12
 BuildRequires: perl
 BuildRequires: e-smith-devtools >= 1.11.0-03
@@ -32,8 +25,11 @@ AutoReqProv: no
 e-smith server and gateway software - domains module.
 
 %changelog
+* 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]
+
 * Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-11
-- Add common <base> tags to e-smith-formmagick's general
+- Add common <base> tags to e-smith-formmagick's general [SME: 4287]
 
 * Wed Mar 12 2008 Shad L. Lords <slords@mail.com> 1.4.0-10
 - Cleanup CREATE/ADD tag mixup [SME: 4045]
@@ -214,15 +210,6 @@ e-smith server and gateway software - do
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
 
 %build
 # Force creation of potentially empty directories