--- rpms/e-smith-email/sme7/e-smith-email.spec	2008/03/12 16:08:44	1.10
+++ rpms/e-smith-email/sme7/e-smith-email.spec	2008/10/07 18:09:47	1.15
@@ -1,14 +1,15 @@
+# $Id$
+
 Summary: e-smith server and gateway - email module
 %define name e-smith-email
 Name: %{name}
-%define version 4.18.0
-%define release 2
+%define version 5.0.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: e-smith-email-4.18.0-fixADD.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: e-smith-base >= 4.15.0-39
 Requires: e-smith-tinydns >= 1.0.0-5
@@ -23,7 +24,7 @@ Requires: perl(Net::SMTP::SSL)
 Requires: perl(Authen::SASL)
 Requires: perl(Net::Server) >= 0.85
 Requires: runit
-Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-formmagick >= 1.4.0-12
 Obsoletes: e-smith-smtp-authentication
 Obsoletes: e-smith-securemail
 BuildRequires: e-smith-devtools >= 1.13.0-03
@@ -34,6 +35,19 @@ AutoReqProv: no
 e-smith server and gateway software - email module.
 
 %changelog
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.0.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* Mon Jul 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.0-5
+- Fix patch to be in accordance with conventions in e-smith-formagick's general [SME: 4285]
+
+* Sat Jul 26 2008 Gavin Weight <gweight@gmail.com> 4.18.0-4
+- Fix pseudonyms modify if using special characters. Thanks - 
+  Federico Simoncelli. [SME: 4346]
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.0-3
+- Add common <base> tags to e-smith-formmagick's general [SME: 4285]
+
 * Wed Mar 12 2008 Shad L. Lords <slords@mail.com> 4.18.0-2
 - Cleanup CREATE/ADD tag mixup [SME: 4045]
 
@@ -1307,7 +1321,6 @@ e-smith server and gateway software - em
 
 %prep
 %setup
-%patch1 -p1
 
 %build
 perl createlinks