--- rpms/e-smith-portforwarding/sme7/e-smith-portforwarding.spec	2008/04/27 16:32:28	1.8
+++ rpms/e-smith-portforwarding/sme7/e-smith-portforwarding.spec	2008/10/07 18:53:00	1.10
@@ -1,24 +1,21 @@
+# $Id$
+
 Summary: portforwarding panel for SME Server
 %define name e-smith-portforwarding
 Name: %{name}
-%define version 1.2.0
-%define release 9
+%define version 2.0.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch0: e-smith-portforwarding-1.2.0-migratedb.patch
-Patch1: e-smith-portforwarding-1.2.0-forward_to_localhost.patch
-Patch2: e-smith-portforwarding-1.2.0-rmDuplicates.patch
-Patch3: e-smith-portforwarding-1.2.0-tags2general.patch
-Patch4: e-smith-portforwarding-1.2.0-add2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
 Requires: e-smith-packetfilter >= 1.13.0-13
 Requires: e-smith-lib >= 1.15.1-19
-Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-formmagick >= 1.4.0-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Obsoletes: e-smith-ipportfw dmc-mitel-portforwarding
 AutoReqProv: no
@@ -27,8 +24,11 @@ AutoReqProv: no
 Adds a Port Forwarding panel to the SME server-manager.
 
 %changelog
+* 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]
+
 * Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 1.2.0-9
-- Add common <base> tags to e-smith-formmagick's general
+- Add common <base> tags to e-smith-formmagick's general [SME: 4282]
 
 * Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.2.0-8
 - Remove <base> tags now in general [SME: 3913]
@@ -414,11 +414,6 @@ Adds a Port Forwarding panel to the SME
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 perl createlinks