--- rpms/e-smith-horde/sme8/e-smith-horde.spec	2008/06/26 04:29:33	1.7
+++ rpms/e-smith-horde/sme8/e-smith-horde.spec	2008/12/21 05:47:37	1.11
@@ -1,16 +1,18 @@
-# $Id: e-smith-horde.spec,v 1.6 2008/06/26 04:25:02 slords Exp $
+# $Id: e-smith-horde.spec,v 1.10 2008/12/06 21:22:50 mrjhb3 Exp $
 
 Summary: e-smith specific Horde configuration and templates.
 %define name e-smith-horde
 Name: %{name}
-%define version 3.2
-%define release 2
+%define version 4.2.0
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: e-smith-horde-3.2.1-header.patch
+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
@@ -23,7 +25,6 @@ Requires: wv
 Requires: xlhtml
 Requires: horde >= 3.2
 Requires: php-pear
-%if "%{?rhel}" == "5"
 Obsoletes: pear-date
 Obsoletes: pear-db
 Obsoletes: pear-file
@@ -36,22 +37,27 @@ Requires: php-pear(HTTP)
 Requires: php-pear(Log)
 Requires: php-pear(Services_Weather)
 Requires: php-pecl(Fileinfo)
-%else
-Requires: pear-date
-Requires: pear-db
-Requires: pear-file
-Requires: pear-log
-Requires: pear-mail
-Requires: pear-mail_mime
-%endif
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
 Obsoletes: dcb-e-smith-horde
 Obsoletes: smeserver-horde-menuarray
 
 %changelog
+* Sat Dec 20 2008 John H. Bennett III <bennettj@johnbennettservices.com> 4.0.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.0.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]
+
 * Tue Jun 24 2008 John H. Bennett III <bennettj@johnbennettservices.com> 3.2-2
-- Upgrade patch for Horde 3.2.1
+- Upgrade patch for Horde 3.2.1 [SME: 4532]
 
 * Mon Jun 2 2008 John H. Bennett III <bennettj@johnbennettservices.com> 3.2-1
 - Initial production build
@@ -63,7 +69,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