SPECS: php-pear-PEAR.spec - fix md5 - avoid pipes to catch errors

[glen]

Author: glen                         Date: Mon Mar  6 22:18:50 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix md5
- avoid pipes to catch errors

---- Files affected:
SPECS:
   php-pear-PEAR.spec (1.107 -> 1.108) 

---- Diffs:

================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.107 SPECS/php-pear-PEAR.spec:1.108
--- SPECS/php-pear-PEAR.spec:1.107	Mon Mar  6 22:48:45 2006
+++ SPECS/php-pear-PEAR.spec	Mon Mar  6 23:18:45 2006
@@ -8,7 +8,7 @@
 %define		_status		stable
 %define		_pearname	%{_class}
 #
-%define	_rel 0.5
+%define	_rel 0.6
 Summary:	PEAR Base System
 Summary(pl):	Podstawowy system PEAR
 Name:		php-pear-%{_pearname}
@@ -20,7 +20,7 @@
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	4d29453e1926f11e05b7cfbf4ab085e7
 Source1:	http://pear.php.net/get/Console_Getopt-1.2.tgz
-# Source2-md5:	8f9ec8253c04350bc01ee7ca941e24b6
+# Source1-md5:	8f9ec8253c04350bc01ee7ca941e24b6
 Source2:	%{name}-template.spec
 Patch0:		%{name}-sysconfdir.patch
 Patch1:		%{name}-rpmpkgname.patch
@@ -123,9 +123,11 @@
 	mv ../package2.xml .
 	P=$(pwd)
 	C=$(echo ../Console_Getopt-*)
-	%define __pear php -doutput_buffering=1 -dinclude_path="${P}:${C}" ${P}/scripts/pearcmd.php
-	%__pear install --packagingroot=$D --offline --nodeps package2.xml
-) | %__pear_install_log
+	%define __pear php -doutput_buffering=1 -dinclude_path="${P}:${C}" ${P}/scripts/pearcmd.php -c pearrc
+	%__pear install --packagingroot=$D --offline --nodeps package2.xml > ../.install.log
+) || { c=$?; cat .install.log; exit $c; }
+cd ..
+cat .install.log | %__pear_install_log
 %else
 %pear_package_setup
 %endif
@@ -255,6 +257,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2006/03/06 22:18:45  glen
+- fix md5
+- avoid pipes to catch errors
+
 Revision 1.107  2006/03/06 21:48:45  glen
 - bootstraping, note this version is still broken as it can't build packages
   already installed on system
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pear-PEAR.spec?r1=1.107&r2=1.108&f=u