--- rpms/e-smith-proxy/sme8/e-smith-proxy.spec	2007/12/27 16:05:32	1.5
+++ rpms/e-smith-proxy/sme8/e-smith-proxy.spec	2008/02/13 22:51:45	1.7
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - pr
 %define name e-smith-proxy
 Name: %{name}
 %define version 4.14.0
-%define release 10
+%define release 12
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -16,12 +16,15 @@ Patch5: e-smith-proxy-4.14.0-bind_addres
 Patch6: e-smith-proxy-4.14.0-AddWpadFeature.patch
 Patch7: e-smith-proxy-4.14.0-squid26.patch
 Patch8: e-smith-proxy-4.14.0-notenforced.patch
+Patch9: e-smith-proxy-4.14.0-rmFormTitle.patch
+Patch10: e-smith-proxy-4.14.0-tags2general.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base
 Requires: squid
 Requires: e-smith-lib >= 1.15.1-19
 Requires: iptables
+Requires: e-smith-formmagick >= 1.4.0-9
 BuildRequires: e-smith-devtools
 Obsoletes: e-smith-transproxy
 AutoReqProv: no
@@ -30,6 +33,12 @@ AutoReqProv: no
 e-smith server and gateway software - proxy module.
 
 %changelog
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 4.14.0-12
+- Remove <base> tags now in general [SME: 3918]
+
+* Sun Feb 10 2008 Stephen Noble <support@dungog.net> 4.14.0-11
+- Remove duplicate <base> entries [SME: 3893]
+
 * Thu Dec 27 2007 Stephen Noble <support@dungog.net> 4.14.0-10
 - wording in panel re proxy in serveronly mode [SME: 3514]
 
@@ -660,6 +669,8 @@ e-smith server and gateway software - pr
 %patch7 -p1
 %endif
 %patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 perl createlinks