--- rpms/e-smith-horde/sme8/e-smith-horde.spec	2010/05/11 04:07:35	1.22
+++ rpms/e-smith-horde/sme8/e-smith-horde.spec	2011/12/23 20:46:19	1.26
@@ -1,10 +1,10 @@
-# $Id: e-smith-horde.spec,v 1.21 2010/02/15 04:53:31 mrjhb3 Exp $
+# $Id: e-smith-horde.spec,v 1.25 2011/07/04 17:23:16 charliebrady Exp $
 
 Summary: e-smith specific Horde configuration and templates.
 %define name e-smith-horde
 Name: %{name}
 %define version 4.2.0
-%define release 13
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -19,6 +19,8 @@ Patch6: e-smith-horde_3.3.6.patch
 Patch7: e-smith-horde_username.hook.patch
 Patch8: e-smith-horde_mime_drivers.php.patch
 Patch9: e-smith-horde_3.3.8.patch
+Patch10: e-smith-horde_3.3.10.patch 
+Patch11: e-smith-horde_verify_from_address.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.9.44, horde >= 2.0, mysql
@@ -42,7 +44,6 @@ Requires: php-pear(File)
 Requires: php-pear(HTTP)
 Requires: php-pear(Log)
 Requires: php-pear(Services_Weather)
-Requires: php-pecl(Fileinfo)
 BuildRequires: e-smith-devtools >= 1.13.1-03
 AutoReqProv: no
 Obsoletes: dcb-e-smith-horde
@@ -50,6 +51,18 @@ Obsoletes: smeserver-horde-menuarray
 Obsoletes: smeserver-trean < 0.1-8
 
 %changelog
+* Fri Dec 23 2011 Jonathan Martens <smeserver-conbtribs@snetram.nl> 4.2.0-17
+- Remove original file that is also templated [SME: 6666]
+
+* Mon Jul 04 2011 Charlie Brady <charlie_brady@mitel.com> 4.2.0-16
+- Remove php-pecl(Fileinfo) dependency. [SME: 6436]
+
+* Sun Jan 2 2011 John H. Bennett III <bennettj@johnbennettservices.com> 4.2.0-15
+- Add option to verify from address in webmail if setting up additional identities [SME:6469]
+
+* Sun Nov 07 2010 John H. Bennett III <bennettj@johnbennettservices.com> 4.2.0-14
+- Upgrade horde templates to reflect changes in Horde 3.3.10 [SME:6348]
+
 * Mon May 10 2010 John H. Bennett III <bennettj@johnbennettservices.com> 4.2.0-13
 - Upgrade horde templates to reflect changes in Horde 3.3.8 [SME: 5938]
 
@@ -110,6 +123,7 @@ so that Horde will work properly on SME
 
 %prep
 %setup
+rm -f root/home/httpd/html/horde/smeserver/mysql_set_horde_password.sql
 
 %patch1 -p1
 %patch2 -p1
@@ -120,6 +134,8 @@ so that Horde will work properly on SME
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 for i in post-install post-upgrade