--- rpms/e-smith-horde/sme8/e-smith-horde.spec 2010/02/13 09:09:23 1.19 +++ 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.18 2010/02/13 02:51:06 dungog 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 10 +%define release 20 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -16,6 +16,14 @@ Patch3: e-smith-horde_cookie_domain.patc Patch4: e-smith-horde_3.3.4-upgrade.patch Patch5: e-smith-horde_3.3.5-upgrade.patch 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 +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 @@ -39,7 +47,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 @@ -47,7 +54,45 @@ Obsoletes: smeserver-horde-menuarray Obsoletes: smeserver-trean < 0.1-8 %changelog -* Sat Jan 23 2010 John H. Bennett III 4.2.0-10 +* Fri Jan 31 2014 chris burnat 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 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 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 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] + +* Sun Jan 2 2011 John H. Bennett III 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 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 4.2.0-13 +- Upgrade horde templates to reflect changes in Horde 3.3.8 [SME: 5938] + +* Sun Feb 14 2010 John H. Bennett III 4.2.0-12 +- Patch to change horde's templated mime_drivers.php file so some additional + settings can be customized [SME: 5224] +- config setprop horde inlineMSWord true|false <-- default is false +- config setprop horde inlineMSExcel true|false <-- default is false +- config setprop horde inlineMSPowerpoint true|false <-- default is false +- config setprop horde inlineWordperfect true|false <-- default is false +- config setprop horde inlineAudio true|false <-- default is true + +* Sat Feb 13 2010 John H. Bennett III 4.2.0-11 +- Patch to make sure username is always saved in lowercase to horde db's [SME:5775] + +* Sat Feb 13 2010 John H. Bennett III 4.2.0-10 - Upgrade horde templates to reflect changes in Horde 3.3.6 [SME: 5774] * Tue Oct 13 2009 John H. Bennett III 4.2.0-9 @@ -92,6 +137,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 @@ -99,6 +145,14 @@ so that Horde will work properly on SME %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 %build for i in post-install post-upgrade