gunnar: server/horde/horde conf.php, 1.8, 1.9 horde-kolab.spec, 1.19, 1.20

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/horde/horde
In directory doto:/tmp/cvs-serv32740/horde/horde

Modified Files:
	conf.php horde-kolab.spec 
Log Message:
kolab/issue2134 ([Horde] Unable to send message with attachments)

Index: conf.php
===================================================================
RCS file: /kolabrepository/server/horde/horde/conf.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- conf.php	10 Oct 2007 09:46:37 -0000	1.8
+++ conf.php	7 Nov 2007 10:37:53 -0000	1.9
@@ -52,8 +52,8 @@
 $conf['mailer']['params']['auth'] = '0';
 $conf['mailer']['type'] = 'smtp';
 $conf['mailformat']['brokenrfc2231'] = false;
-$conf['tmpdir'] = dirname(__FILE__) . '/../tmp/';
-$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../tmp';
+$conf['tmpdir'] = dirname(__FILE__) . '/../../../tmp/horde';
+$conf['vfs']['params']['vfsroot'] = dirname(__FILE__) . '/../../../tmp/horde';
 $conf['vfs']['type'] = 'file';
 $conf['sessionhandler']['type'] = 'none';
 $conf['image']['convert'] = '/usr/bin/convert';

Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- horde-kolab.spec	14 Oct 2007 12:31:58 -0000	1.19
+++ horde-kolab.spec	7 Nov 2007 10:37:53 -0000	1.20
@@ -2,8 +2,8 @@
 %define         V_horde_name horde
 %define         V_package %{V_horde_name}-kolab
 %define         V_year  2007
-%define         V_month 10
-%define         V_day   13
+%define         V_month 11
+%define         V_day   01
 %define         V_version 3.2_alpha
 %define         V_uver    3.2-alpha
 %define         V_date %{V_year}-%{V_month}-%{V_day}
@@ -70,6 +70,7 @@
 
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/apache/log/horde
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde
+	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/tmp/horde
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
 	cd %{V_horde_name}-%{V_uver}
@@ -90,6 +91,7 @@
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/horde \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp/horde \
 	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/horde-kolab-conf.template'\
 	    '%defattr(-,%{l_nusr},%{l_ngrp}) %{l_prefix}/var/kolab/www/horde/config/conf.php'    \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/horde/config/conf.php'    \