--- rpms/e-smith-proxy/sme7/e-smith-proxy.spec	2008/02/10 12:17:48	1.6
+++ rpms/e-smith-proxy/sme7/e-smith-proxy.spec	2008/08/15 23:49:40	1.10
@@ -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 11
+%define release 15
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,12 +17,17 @@ Patch6: e-smith-proxy-4.14.0-AddWpadFeat
 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
+Patch13: e-smith-proxy-4.14.0-no_confref-sme8.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
@@ -31,6 +36,18 @@ AutoReqProv: no
 e-smith server and gateway software - proxy module.
 
 %changelog
+* Fri Aug 15 2008 Shad L. Lords <slords@mail.com> 4.14.0-15
+- Fix obsolete use of esmith::db class in template fragment in sme8. [SME: 4509]
+
+* 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]
 
@@ -665,6 +682,13 @@ e-smith server and gateway software - pr
 %endif
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%if "%{?rhel}" == "4"
+%patch12 -p1
+%else
+%patch13 -p1
+%endif
 
 %build
 perl createlinks