gunnar: server/pear pear.spec.template,1.5,1.6
cvs at kolab.org
cvs at kolab.org
Tue Feb 16 08:33:47 CET 2010
Author: gunnar
Update of /kolabrepository/server/pear
In directory doto:/tmp/cvs-serv7041/pear
Modified Files:
pear.spec.template
Log Message:
If we install something in the h4 hierarchy we need to place all elements (doc, bin, data, test) separate from the usual libraries in /kolab/lib/php
Index: pear.spec.template
===================================================================
RCS file: /kolabrepository/server/pear/pear.spec.template,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- pear.spec.template 12 Jan 2010 13:57:48 -0000 1.5
+++ pear.spec.template 16 Feb 2010 07:33:45 -0000 1.6
@@ -57,10 +57,19 @@
%build
%install
+ if [ "%{V_php_lib_loc}" == "php-h4" ]; then
+ PHP_BIN_DIR="bin-h4"
+ else
+ PHP_BIN_DIR="bin"
+ fi
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"\
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
%{l_prefix}/bin/pear -d www_dir="%{l_prefix}/var/kolab/www/%{V_www_loc}" \
+ -d bin_dir="%{l_prefix}/$PHP_BIN_DIR" \
-d php_dir="%{l_prefix}/lib/%{V_php_lib_loc}" \
+ -d doc_dir="%{l_prefix}/lib/%{V_php_lib_loc}/doc" \
+ -d data_dir="%{l_prefix}/lib/%{V_php_lib_loc}/data" \
+ -d test_dir="%{l_prefix}/lib/%{V_php_lib_loc}/test" \
install --offline --force --nodeps -P $RPM_BUILD_ROOT \
package.xml
More information about the commits
mailing list