--- rpms/e-smith-portforwarding/sme7/e-smith-portforwarding.spec	2007/06/26 18:35:58	1.2
+++ rpms/e-smith-portforwarding/sme7/e-smith-portforwarding.spec	2008/10/07 18:53:00	1.10
@@ -1,19 +1,21 @@
+# $Id$
+
 Summary: portforwarding panel for SME Server
 %define name e-smith-portforwarding
 Name: %{name}
-%define version 1.2.0
-%define release 3
+%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
 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-12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Obsoletes: e-smith-ipportfw dmc-mitel-portforwarding
 AutoReqProv: no
@@ -22,6 +24,28 @@ 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 [SME: 4282]
+
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 1.2.0-8
+- Remove <base> tags now in general [SME: 3913]
+
+* Sun Feb 10 2008 Stephen Noble <support@dungog.net> 1.2.0-7
+- Remove duplicate <base> entries [SME: 3888]
+
+* Thu Nov 08 2007 Gavin Weight<gweight@mail.com> 1.2.0-6
+- Remove/Fix portforwarding.pm.orig file. [SME: 3526]
+
+* Tue Oct 16 2007 Charlie Brady <charlie_brady@mitel.com> 1.2.0-5
+- Use $OUTERNET for target of localhost port forwards, not externalIP
+  pulled from db at template expansion time. [SME: 2760]
+
+* Wed Jun 26 2007 Shad L. Lords <slords@mail.com> 1.2.0-4
+- Ensure portforwarding dbs exists [SME: 54]
+
 * Tue Jun 26 2007 Shad L. Lords <slords@mail.com> 1.2.0-3
 - Migrate portforwarding to own databases [SME: 54]
 
@@ -390,7 +414,6 @@ Adds a Port Forwarding panel to the SME
 
 %prep
 %setup
-%patch0 -p1
 
 %build
 perl createlinks
@@ -401,6 +424,14 @@ rm -rf $RPM_BUILD_ROOT
 rm -f e-smith-%{version}-filelist
 /sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist
 
+for proto in tcp udp
+do
+    mkdir -p $RPM_BUILD_ROOT/home/e-smith/db
+    touch $RPM_BUILD_ROOT/home/e-smith/db/portforward_$proto
+    echo "%config(noreplace) %attr(0640,root,admin) /home/e-smith/db/portforward_$proto" \
+        >> %{name}-%{version}-filelist
+done
+
 %clean
 rm -rf $RPM_BUILD_ROOT