--- rpms/e-smith-portforwarding/sme7/e-smith-portforwarding.spec	2007/11/08 22:31:28	1.5
+++ rpms/e-smith-portforwarding/sme7/e-smith-portforwarding.spec	2008/02/13 22:51:45	1.7
@@ -2,7 +2,7 @@ Summary: portforwarding panel for SME Se
 %define name e-smith-portforwarding
 Name: %{name}
 %define version 1.2.0
-%define release 6
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -10,11 +10,14 @@ 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
 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
 BuildRequires: e-smith-devtools >= 1.13.1-03
 Obsoletes: e-smith-ipportfw dmc-mitel-portforwarding
 AutoReqProv: no
@@ -23,6 +26,12 @@ AutoReqProv: no
 Adds a Port Forwarding panel to the SME server-manager.
 
 %changelog
+* 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]
+
 * Thu Nov 08 2007 Gavin Weight<gweight@mail.com> 1.2.0-6
 - Remove/Fix portforwarding.pm.orig file. [SME: 3526]
 
@@ -403,6 +412,8 @@ Adds a Port Forwarding panel to the SME
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 perl createlinks