--- 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	2008/02/10 12:17:48	1.6
@@ -2,7 +2,7 @@ Summary: portforwarding panel for SME Se
 %define name e-smith-portforwarding
 Name: %{name}
 %define version 1.2.0
-%define release 5
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -10,6 +10,7 @@ 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
@@ -23,6 +24,12 @@ AutoReqProv: no
 Adds a Port Forwarding panel to the SME server-manager.
 
 %changelog
+* Sun Feb 10 2008 Stephen Noble <support@dungog.net> 1.2.0-7
+- Remove duplicate <base> entries [SME: 3893]
+
+* 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]
@@ -400,6 +407,7 @@ Adds a Port Forwarding panel to the SME
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks