--- rpms/e-smith-horde/sme8/e-smith-horde.spec	2008/12/22 00:59:37	1.12
+++ rpms/e-smith-horde/sme8/e-smith-horde.spec	2010/02/13 02:51:06	1.18
@@ -1,10 +1,10 @@
-# $Id: e-smith-horde.spec,v 1.11 2008/12/21 05:47:37 mrjhb3 Exp $
+# $Id: e-smith-horde.spec,v 1.17 2009/10/14 02:35:16 mrjhb3 Exp $
 
 Summary: e-smith specific Horde configuration and templates.
 %define name e-smith-horde
 Name: %{name}
 %define version 4.2.0
-%define release 5
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,8 @@ 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
+Patch4: e-smith-horde_3.3.4-upgrade.patch
+Patch5: e-smith-horde_3.3.5-upgrade.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.9.44, horde >= 2.0, mysql
@@ -31,11 +33,9 @@ Obsoletes: pear-file
 Obsoletes: pear-log
 Obsoletes: pear-mail
 Obsoletes: pear-mail_mime
-Obsoletes: php-pear-HTTP-Request  
 Requires: php-pear(Date)
 Requires: php-pear(File)
 Requires: php-pear(HTTP)
-Requires: php-pear(HTTP-Request)
 Requires: php-pear(Log)
 Requires: php-pear(Services_Weather)
 Requires: php-pecl(Fileinfo)
@@ -46,6 +46,19 @@ Obsoletes: smeserver-horde-menuarray
 Obsoletes: smeserver-trean < 0.1-8
 
 %changelog
+* Tue Oct 13 2009 John H. Bennett III <bennettj@johnbennettservices.com> 4.2.0-9
+- Really apply patch from previous attempt [SME: 5509]
+
+* Tue Oct 13 2009 John H. Bennett III <bennettj@johnbennettservices.com> 4.2.0-8  
+- Upgrade horde templates to reflect changes in Horde 3.3.5 [SME: 5509]   
+
+* Sat Jun 20 2009 John H. Bennett III <bennettj@johnbennettservices.com> 4.2.0-7
+- Upgrade to horde templates to reflect changes in Horde 3.3.4 [SME: 5372]
+
+* 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]
 
@@ -79,6 +92,8 @@ so that Horde will work properly on SME
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 for i in post-install post-upgrade