--- 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/10/07 19:14:44	1.11
@@ -1,28 +1,22 @@
+# $Id$
+
 Summary: e-smith server and gateway - proxy module
 %define name e-smith-proxy
 Name: %{name}
-%define version 4.14.0
-%define release 11
+%define version 5.0.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: e-smith-proxy-4.14.0-squidrotate.patch
-Patch2: e-smith-proxy-4.14.0-proxycron.patch
-Patch3: e-smith-proxy-4.14.0-http_port.patch
-Patch4: e-smith-proxy-4.14.0-squid.conf_perms.patch
-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
 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 +25,21 @@ AutoReqProv: no
 e-smith server and gateway software - proxy module.
 
 %changelog
+* Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.0.0-1.sme
+- Roll new stream to separate sme7/sme8 trees [SME: 4633]
+
+* 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]
 
@@ -654,17 +663,6 @@ e-smith server and gateway software - pr
 
 %prep
 %setup
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%if "%{?rhel}" == "5"
-%patch7 -p1
-%endif
-%patch8 -p1
-%patch9 -p1
 
 %build
 perl createlinks