SOURCES: php-pear-build-macros - updated

[glen]

Author: glen                         Date: Sun Sep 18 14:06:25 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   php-pear-build-macros (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/php-pear-build-macros
diff -u SOURCES/php-pear-build-macros:1.3 SOURCES/php-pear-build-macros:1.4
--- SOURCES/php-pear-build-macros:1.3	Sun Sep 18 14:51:10 2005
+++ SOURCES/php-pear-build-macros	Sun Sep 18 16:06:20 2005
@@ -3,9 +3,12 @@
 %define	pear_package_setup(a:) \
 %setup -q -c -T\
 D=%{_builddir}/%{name}-%{version} \
-sh %{_bindir}/pear \\\
+pear \\\
 	-d doc_dir=/docs \\\
+	-d php_dir=%{php_pear_dir} \\\
+	-d bin_dir=%{_bindir} \\\
 	-d data_dir=%{php_pear_dir}/data \\\
+	-d test_dir=%{php_pear_dir}/tests \\\
 	install \\\
 	--installroot=${D} \\\
 	--offline \\\
@@ -17,7 +20,7 @@
 rm ./%{php_pear_dir}/.{lock,filemap} \
 # undos sources \
 find . -type f -print0 | xargs -0 sed -i -e 's,\\r$,,' \
-# don't know why installroot stays in installed files. PEAR bug? \
+# bug in PEAR --installroot. \
 grep -rl "${D}" ./{%{_bindir},%{php_pear_dir}}/* | xargs -r sed -i -e "s,${D},," \
 %{nil}
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-pear-build-macros?r1=1.3&r2=1.4&f=u