--- rpms/e-smith-horde/sme9/e-smith-horde.spec 2013/03/11 17:49:57 1.2 +++ rpms/e-smith-horde/sme9/e-smith-horde.spec 2014/01/26 16:59:46 1.7 @@ -1,15 +1,18 @@ -# $Id: e-smith-horde.spec,v 1.1 2013/02/14 16:15:22 slords Exp $ +# $Id: e-smith-horde.spec,v 1.6 2013/12/21 04:53:16 wellsi Exp $ Summary: e-smith specific Horde configuration and templates. %define name e-smith-horde Name: %{name} %define version 4.4.0 -%define release 2 +%define release 7 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.xz +Patch1: e-smith-horde-4.4.0-webmail-only-local-network.patch +Patch2: e-smith-horde-4.4.0-85HordeAccess-whitespace.patch +Patch3: e-smith-horde-4.4.0-give_value_horde-access.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base >= 4.9.44, horde >= 2.0, mysql @@ -23,6 +26,10 @@ Requires: xlhtml Requires: horde >= 3.2 Requires: php-pear Obsoletes: php-devel <= 5.3.3-14 +Obsoletes: autoconf <= 2.59 +Obsoletes: automake <= 1.9.6 +Obsoletes: imake <= 1.0.2 +Obsoletes: libXdmcp <= 1.0.1 Obsoletes: pear-date Obsoletes: pear-db Obsoletes: pear-file @@ -41,6 +48,22 @@ Obsoletes: smeserver-horde-menuarray Obsoletes: smeserver-trean < 0.1-8 %changelog +* Sun Jan 26 2014 Ian Wells 4.4.0-7.sme +- Ensure initialisation of variables in webmail-only-local-network by Stephane de Labrusse [SME: 7351] + +* Fri Dec 20 2013 Ian Wells 4.4.0-6.sme +- Update of allow webmail-only-local-network by Stephane de Labrusse [SME: 7351] +- Whitespace patch for 85HordeAccess + +* Tue Dec 10 2013 Chris Burnat 4.4.0-5.sme +- Allow webmail-only-local-network by Stephane de Labrusse [SME: 7351] + +* Mon Mar 11 2013 Shad L. Lords 4.4.0-4.sme +- Obsolete el5 version of packages required by requires [SME: 7273] + +* Mon Mar 11 2013 Shad L. Lords 4.4.0-3.sme +- Obsolete el5 version of packages required by php-devel [SME: 7273] + * Mon Mar 11 2013 Shad L. Lords 4.4.0-2.sme - Obsolete el5 version of php-devel [SME: 7273] @@ -119,6 +142,9 @@ so that Horde will work properly on SME %prep %setup +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build perl createlinks