--- rpms/e-smith-portforwarding/sme7/e-smith-portforwarding.spec	2008/02/10 12:17:48	1.6
+++ rpms/e-smith-portforwarding/sme7/e-smith-portforwarding.spec	2010/06/03 14:02:36	1.13
@@ -1,21 +1,26 @@
+# $Id: e-smith-portforwarding.spec,v 1.12 2010/03/05 20:07:37 slords Exp $
+
 Summary: portforwarding panel for SME Server
 %define name e-smith-portforwarding
 Name: %{name}
-%define version 1.2.0
-%define release 7
+%define version 2.0.0
+%define release 3
 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
+Patch1: e-smith-portforwarding-2.2.0-AllowHosts.patch
+Patch2: e-smith-portforwarding-2.2.0-AllowHosts.patch2
+Patch3: e-smith-portforwarding-2.2.0-fwd2local_serveronly.patch
+Patch4: e-smith-portforwarding-2.2.0-filter-source-address.patch
+Patch5: e-smith-portforwarding-2.2.0-filter-source-address2.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
@@ -24,8 +29,24 @@ AutoReqProv: no
 Adds a Port Forwarding panel to the SME server-manager.
 
 %changelog
+* Thu Mar 11 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.0.0-3.sme
+- Enable port forwards to localhost if mode is serveronly [SME: 5849]
+
+* Thu Feb 4 2010 Filippo Carletti <filippo.carletti@gmail.com> 2.0.0-2.sme
+- Add option to limit port forwards from source ip [SME: 6008]
+- Add Text Description For Each Port Forwarding [SME: 6007]
+
+* 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: 3893]
+- 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]
@@ -394,7 +415,7 @@ Adds a Port Forwarding panel to the SME
 - merged in e-smith-ipportfw-0.1.1-1.noarch.rpm
 - [0.0.1-3]
 * Mon Dec 31 2001 Darrell May <dmay@netsourced.com>
-- added "Shad L. Lords" <lists@lordsfam.net>, e-smith-iportfw 35SetPortFW
+- added "Shad L. Lords" <slords@mail.com>, e-smith-iportfw 35SetPortFW
 - templates-custom fragment supporting dest port addresses
 - updated portforwarding panel to match
 - removed first/last portforward panel bug by adding return on Operation Status
@@ -405,9 +426,11 @@ Adds a Port Forwarding panel to the SME
 
 %prep
 %setup
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks