--- rpms/e-smith-domains/sme7/e-smith-domains.spec	2007/10/17 13:50:21	1.2
+++ rpms/e-smith-domains/sme7/e-smith-domains.spec	2008/04/26 22:37:03	1.7
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - do
 %define name e-smith-domains
 Name: %{name}
 %define version 1.4.0
-%define release 6
+%define release 11
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,10 +12,16 @@ Patch0: e-smith-domains-1.4.0-CorpDNSpan
 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
 BuildRequires: perl(Test::Inline) >= 0.12
 BuildRequires: perl
 BuildRequires: e-smith-devtools >= 1.11.0-03
@@ -26,6 +32,21 @@ AutoReqProv: no
 e-smith server and gateway software - domains module.
 
 %changelog
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.4.0-11
+- Add common <base> tags to e-smith-formmagick's general
+
+* Wed Mar 12 2008 Shad L. Lords <slords@mail.com> 1.4.0-10
+- Cleanup CREATE/ADD tag mixup [SME: 4045]
+
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.4.0-9
+- Remove <base> tags now in general [SME: 3926]
+
+* Fri Oct 26 2007 Charlie Brady <charlie_brady@mitel.com> 1.4.0-8
+- Fix removal of Corporate DNS setting (take III). [SME: 3415]
+
+* Sat Oct 20 2007 Charlie Brady <charlie_brady@mitel.com> 1.4.0-7
+- Add missing braces in last patch. [SME: 3415]
+
 * Tue Oct 16 2007 Charlie Brady <charlie_brady@mitel.com> 1.4.0-6
 - Allow Corporate DNS settings to be removed via panel. [SME: 3415]
 
@@ -197,6 +218,11 @@ e-smith server and gateway software - do
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 # Force creation of potentially empty directories