--- rpms/e-smith-horde/sme8/e-smith-horde.spec	2008/02/05 16:32:03	1.3
+++ rpms/e-smith-horde/sme8/e-smith-horde.spec	2008/04/02 20:38:16	1.4
@@ -2,7 +2,7 @@ Summary: e-smith specific Horde configur
 %define name e-smith-horde
 Name: %{name}
 %define version 1.13.0
-%define release 22
+%define release 24
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -28,6 +28,8 @@ Patch17: e-smith-horde-1.13.0-18.horde_a
 Patch18: e-smith-horde-1.13.0-19.horde_mysql_init_rename.patch
 Patch19: e-smith-horde-1.13.0-20.horde_314.patch
 Patch20: e-smith-horde-1.13.0-21.horde_315.patch
+Patch21: e-smith-horde-1.13.0-23.upgrade_to_horde317.patch
+Patch22: e-smith-horde-1.13.0-24.webmail_name.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.9.44, horde >= 2.0, mysql
@@ -67,6 +69,18 @@ Obsoletes: dcb-e-smith-horde
 Obsoletes: smeserver-horde-menuarray
 
 %changelog
+* Tue Apr 1 2008 John H. Bennett III <bennettj@johnbennettservices.com> 1.13.0-24
+- Patch to allow users to add a different name to their webmail installation other
+  than horde.  To use - config setprop horde Name xxxx ; signal-event email-update.
+  Change will be seen in /home/httpd/html/horde/config/registry.php/110AppRegistryHorde
+  [SME: 3707]
+
+* Tue Apr 1 2008 John H. Bennett III <bennettj@johnbennettservices.com> 1.13.0-23
+- Updated horde registry.php template, per horde 3.1.6 and 3.1.7
+  Webroot detection was changed so if users upgrade and webmail no longer works
+  reference bug http://bugs.contribs.org/show_bug.cgi?id=3181.  For a permanent
+  fix reference bug http://bugs.contribs.org/show_bug.cgi?id=3707  [SME: 4094]
+
 * Thu Nov 15 2007 John H. Bennett III <bennettj@johnbennettservices.com> 1.13.0-22
 - Updated horde registry.php template, per horde 3.1.5 [SME: 3572]
 
@@ -756,6 +770,8 @@ horde specific configuration items.
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
+%patch22 -p1
 
 %build
 for i in post-install post-upgrade