--- rpms/e-smith-horde/sme8/e-smith-horde.spec 2011/07/04 17:23:16 1.25 +++ 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.24 2011/01/03 02:47:02 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 16 +%define release 17 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -51,6 +51,9 @@ Obsoletes: smeserver-horde-menuarray Obsoletes: smeserver-trean < 0.1-8 %changelog +* Fri Dec 23 2011 Jonathan Martens 4.2.0-17 +- Remove original file that is also templated [SME: 6666] + * Mon Jul 04 2011 Charlie Brady 4.2.0-16 - Remove php-pecl(Fileinfo) dependency. [SME: 6436] @@ -120,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