gunnar: server/kolab-webclient kolab-webclient.spec, 1.23.2.6.2.13, 1.23.2.6.2.14

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv19243

Modified Files:
      Tag: suc_branch
	kolab-webclient.spec 
Log Message:
Use the gettext binaries from within the /kolab installation. Explicitely turn off the safe_mode to allow correct detection of the binaries. It is not possible to catch an error in the script at the moment as the exit codes from translation.php are not correct.

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.23.2.6.2.13
retrieving revision 1.23.2.6.2.14
diff -u -d -r1.23.2.6.2.13 -r1.23.2.6.2.14
--- kolab-webclient.spec	22 Jun 2009 13:54:14 -0000	1.23.2.6.2.13
+++ kolab-webclient.spec	22 Jun 2009 20:54:38 -0000	1.23.2.6.2.14
@@ -145,8 +145,7 @@
 	sed -i -e 's#@@@turba_confdir@@@#%{l_prefix}/var/kolab/www/client/turba/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
 
 	# Refresh the translations
-	sed -i -e 's#/usr/bin/php#/kolab/bin/php#' $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/po/translation.php
-	$RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/po/translation.php make --module dimp --no-compendium
+	PATH="%{l_prefix}/bin" %{l_prefix}/bin/php -d safe_mode=0 -f $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/po/translation.php make --module dimp --no-compendium
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:4} %{S:5} \
 	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd/config