--- rpms/e-smith-horde/sme8/e-smith-horde.spec	2011/12/23 20:46:19	1.26
+++ rpms/e-smith-horde/sme8/e-smith-horde.spec	2014/01/31 01:12:25	1.27
@@ -1,10 +1,10 @@
-# $Id: e-smith-horde.spec,v 1.25 2011/07/04 17:23:16 charliebrady Exp $
+# $Id: e-smith-horde.spec,v 1.26 2011/12/23 20:46:19 snetram Exp $
 
 Summary: e-smith specific Horde configuration and templates.
 %define name e-smith-horde
 Name: %{name}
 %define version 4.2.0
-%define release 17
+%define release 20
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -21,6 +21,9 @@ Patch8: e-smith-horde_mime_drivers.php.p
 Patch9: e-smith-horde_3.3.8.patch
 Patch10: e-smith-horde_3.3.10.patch 
 Patch11: e-smith-horde_verify_from_address.patch
+Patch12: e-smith-horde-4.2.0-webmail-only-local-network.patch
+Patch13: e-smith-horde-4.2.0-85HordeAccess-whitespace.patch
+Patch14: e-smith-horde-4.2.0-HordeAccess-default.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.9.44, horde >= 2.0, mysql
@@ -51,6 +54,17 @@ Obsoletes: smeserver-horde-menuarray
 Obsoletes: smeserver-trean < 0.1-8
 
 %changelog
+* Fri Jan 31 2014 chris burnat <devlist@burnat.com> 4.2.0-18.sme
+- Replace last change with a default value for horde access [SME: 8165]
+- Code by Ian Welsh
+
+* Fri Jan 31 2014 chris burnat <devlist@burnat.com> 4.2.0-19.sme
+- Ensure initialisation of variables in webmail-only-local-network by Stephane de Labrusse [SME: 8165]
+
+* Fri Jan 31 2014 chris burnat <devlist@burnat.com> 4.2.0-20.sme
+- Update of allow webmail-only-local-network by Stephane de Labrusse [SME: 8165]
+- Whitespace patch for 85HordeAccess
+
 * Fri Dec 23 2011 Jonathan Martens <smeserver-conbtribs@snetram.nl> 4.2.0-17
 - Remove original file that is also templated [SME: 6666]
 
@@ -136,6 +150,9 @@ rm -f root/home/httpd/html/horde/smeserv
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %build
 for i in post-install post-upgrade