--- rpms/e-smith-horde/sme8/e-smith-horde.spec	2008/10/07 18:23:44	1.9
+++ rpms/e-smith-horde/sme8/e-smith-horde.spec	2008/12/24 23:00:37	1.14
@@ -1,15 +1,18 @@
-# $Id: e-smith-horde.spec,v 1.8 2008/09/16 18:04:56 bytegw Exp $
+# $Id: e-smith-horde.spec,v 1.13 2008/12/24 22:59:57 mrjhb3 Exp $
 
 Summary: e-smith specific Horde configuration and templates.
 %define name e-smith-horde
 Name: %{name}
 %define version 4.2.0
-%define release 1
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
+Patch1: e-smith-horde_3.3-upgrade.patch
+Patch2: e-smith-horde_3.3.2-upgrade.patch
+Patch3: e-smith-horde_cookie_domain.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.9.44, horde >= 2.0, mysql
@@ -38,8 +41,26 @@ BuildRequires: e-smith-devtools >= 1.13.
 AutoReqProv: no
 Obsoletes: dcb-e-smith-horde
 Obsoletes: smeserver-horde-menuarray
+Obsoletes: smeserver-trean < 0.1-8
 
 %changelog
+* Thu Dec 24 2008 John H. Bennett III <bennettj@johnbennettservices.com> 4.2.0-6
+- Updated spec file to remove requires and obsoletes of php-pear-HTTP-Request
+  information moved to e-smith-imp for both sme7 and sme8 [SME: 4821]
+
+* Sun Dec 21 2008 John H. Bennett III <bennettj@johnbennettservices.com> 4.2.0-5
+- Update to Spec file to obsolete smeserver-trean < 0.1-8  [SME: 4860]
+
+* Sat Dec 20 2008 John H. Bennett III <bennettj@johnbennettservices.com> 4.2.0-4
+- Patch to conf.php template to set a blank cookie domain so that FQDN and non-FQDN
+- access to webmail will work. Remove klutz template from registry.php [SME: 4787]
+
+* Sat Dec 06 2008 John H. Bennett III <bennettj@johnbennettservices.com> 4.2.0-3
+- Upgrade to horde templates to reflect changes in Horde 3.3.2
+
+* Sat Dec 06 2008 John H. Bennett III <bennettj@johnbennettservices.com> 4.2.0-2       
+- Upgrade to horde templates to reflect changes in Horde 3.3  [SME: 4831]
+
 * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 4.2.0-1.sme
 - Roll new stream to separate sme7/sme8 trees [SME: 4633]
 
@@ -57,6 +78,10 @@ so that Horde will work properly on SME
 %prep
 %setup
 
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+
 %build
 for i in post-install post-upgrade
 do