--- rpms/e-smith-portforwarding/sme7/e-smith-portforwarding.spec	2007/10/17 13:50:22	1.4
+++ rpms/e-smith-portforwarding/sme7/e-smith-portforwarding.spec	2010/02/04 17:07:02	1.11
@@ -1,20 +1,23 @@
+# $Id: e-smith-portforwarding.spec,v 1.10 2008/10/07 18:53:00 slords Exp $
+
 Summary: portforwarding panel for SME Server
 %define name e-smith-portforwarding
 Name: %{name}
-%define version 1.2.0
-%define release 5
+%define version 2.0.0
+%define release 2
 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
+Patch1: e-smith-portforwarding-2.2.0-AllowHosts.patch
+Patch2: e-smith-portforwarding-2.2.0-AllowHosts.patch2
 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
@@ -23,6 +26,24 @@ AutoReqProv: no
 Adds a Port Forwarding panel to the SME server-manager.
 
 %changelog
+* Thu Feb 4 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.0.0-2.sme
+- Enable port forwards to localhost if mode is serveronly [SME: 1003]
+
+* 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]
@@ -398,8 +419,8 @@ Adds a Port Forwarding panel to the SME
 
 %prep
 %setup
-%patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks