SOURCES (DEVEL): php-pear-build-macros - using --packagingroot and...

[glen]

Author: glen                         Date: Tue Mar  7 17:55:14 2006 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- using --packagingroot and bootstrapping for PEAR

---- Files affected:
SOURCES:
   php-pear-build-macros (1.17 -> 1.17.4.1) 

---- Diffs:

================================================================
Index: SOURCES/php-pear-build-macros
diff -u SOURCES/php-pear-build-macros:1.17 SOURCES/php-pear-build-macros:1.17.4.1
--- SOURCES/php-pear-build-macros:1.17	Tue Sep 27 23:17:42 2005
+++ SOURCES/php-pear-build-macros	Tue Mar  7 18:55:09 2006
@@ -30,35 +30,45 @@
 # in %%post of a package. you should put this file to %%doc. noautocompressdoc is
 # automatically added for this file.
 #
-%define pear_package_setup(a:n:zf) \
+%define	__pear_install_log \
+tee install.log \
+# make post message of optional packages \
+grep 'can optionally use' install.log | sed -e 's,package "pear/,package "php-pear-,g;s,^pear/,php-pear-,' > optional-packages.txt \
+if [ -s optional-packages.txt ]; then \
+	awk -F'"' '/use package/{print $2}' optional-packages.txt | sed -e "s,_,/,g;s,php-pear-, 'pear(,;s,$,.*)'," | tr -d '\\\n' > _noautoreq \
+else \
+	rm -f optional-packages.txt \
+fi \
+# undos sources \
+find . -type f -print0 | xargs -0 sed -i -e 's,\\r$,,' \
+
+%define	__pear sh -x /usr/bin/pear -dinclude_path=.
+%define	__pear php -dinclude_path=. -doutput_buffering=1 -dopen_basedir= -dmemory_limit=24M /tmp/p/pearcmd.php
+
+%define pear_package_setup(a:n:zfqc) \
 %setup -q -c -T -n %{-n*}%{!-n:%{_pearname}-%{version}}\
-D=%{_builddir}/%{-n*}%{!-n:%{_pearname}-%{version}} \
-%{-z:tar zxf %{S:%{-a*}%{!-a:0}}; P=%{_pearname}-%{version}/package.xml; [ -f $P ] || P=package.xml} \
-pear \\\
+_D=%{_builddir}/%{-n*}%{!-n:%{_pearname}-%{version}} \
+%{-z:tar zxf %{S:0}; %{-a:tar zxf %{S:%{-a*}};} _P=package2.xml; [ -f $_P ] || _P=package.xml; _N=%{!-n:%{_pearname}-%{version}}; mv $_P $_N; cd $_N} \
+install -d ./%{php_pear_dir} \
+%__pear \\\
+	-c pearrc \\\
 	-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} \\\
+	--packagingroot=${_D} \\\
 	--offline \\\
 	--nodeps \\\
 	%{-f:--force} \\\
-	%{!-z:%{S:%{-a*}%{!-a:0}}}%{-z:$P} | tee install.log \
-# make post message of optional packages \
-grep 'can optionally use' install.log | sed -e 's,package "pear/,package "php-pear-,g;s,^pear/,php-pear-,' > optional-packages.txt \
-if [ -s optional-packages.txt ]; then \
-	awk -F'"' '/use package/{print $2}' optional-packages.txt | sed -e "s,_,/,g;s,php-pear-, 'pear(,;s,$,.*)'," | tr -d '\\\n' > _noautoreq \
-else \
-	rm -f optional-packages.txt \
-fi \
-rm ./%{php_pear_dir}/.{lock,filemap} \
-# undos sources \
-find . -type f -print0 | xargs -0 sed -i -e 's,\\r$,,' \
+	%{!-z:%{S:%{-a*}%{!-a:0}}}%{-z:$_P} > .install.log || { c=$?; cat .install.log; exit $c; } \
+%{-z:cd ..} \
+cat %{-z:$_N/}.install.log | %__pear_install_log \
+#rm ./%{php_pear_dir}/.{lock,filemap} \
 # bug in PEAR --installroot. \
 # http://pear.php.net/bugs/bug.php?id=5448 \
-grep -rl "${D}" ./{%{_bindir},%{php_pear_dir}}/* | xargs -r sed -i -e "s,${D},," \
+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.17&r2=1.17.4.1&f=u