--- rpms/e-smith-proxy/sme7/e-smith-proxy.spec	2007/12/20 23:06:02	1.4
+++ rpms/e-smith-proxy/sme7/e-smith-proxy.spec	2008/08/15 18:41:49	1.9
@@ -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 9
+%define release 14
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -15,12 +15,18 @@ Patch4: e-smith-proxy-4.14.0-squid.conf_
 Patch5: e-smith-proxy-4.14.0-bind_address.patch
 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
+Patch11: e-smith-proxy-4.14.0-ChangeWpadURL.patch
+Patch12: e-smith-proxy-4.14.0-no_confref.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
@@ -29,6 +35,21 @@ AutoReqProv: no
 e-smith server and gateway software - proxy module.
 
 %changelog
+* Fri Aug 15 2008 Charlie Brady <charlie_brady@mitel.com> 4.14.0-14
+- Fix obsolete use of esmith::db class in template fragment. [SME: 4509]
+
+* Fri Feb 22 2008 Gavin Weight <gweight@gmail.com> 4.14.0-13
+- Change Wpad URL to match system domain. [SME: 3512]
+
+* 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]
+
 * Thu Dec 20 2007 Shad L. Lords <slords@mail.com> 4.14.0-9
 - Update squid directives for sme8 [SME: 2518]
 
@@ -655,7 +676,11 @@ e-smith server and gateway software - pr
 %if "%{?rhel}" == "5"
 %patch7 -p1
 %endif
-
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %build
 perl createlinks