Author: glen Date: Mon Mar 6 23:28:58 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- use more existing macros
---- Files affected:
SPECS:
php-pear-PEAR.spec (1.108 -> 1.109)
---- Diffs:
================================================================
Index: SPECS/php-pear-PEAR.spec
diff -u SPECS/php-pear-PEAR.spec:1.108 SPECS/php-pear-PEAR.spec:1.109
--- SPECS/php-pear-PEAR.spec:1.108 Mon Mar 6 23:18:45 2006
+++ SPECS/php-pear-PEAR.spec Tue Mar 7 00:28:52 2006
@@ -116,20 +116,12 @@
%prep
%if %{with bootstrap}
-%setup -qc -a1
-(
- D=$(pwd)
- cd %{_class}-%{version}
- mv ../package2.xml .
- P=$(pwd)
- C=$(echo ../Console_Getopt-*)
- %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
+P=%{_class}-%{version}
+C=$(basename %{SOURCE1} .tgz)
+%define __pear php -doutput_buffering=1 -dinclude_path=".:../${C}"
scripts/pearcmd.php
+%pear_package_setup -z -a1
%else
-%pear_package_setup
+%pear_package_setup -z
%endif
%patch0 -p1
@@ -257,6 +249,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.109 2006/03/06 23:28:52 glen
+- use more existing macros
+
Revision 1.108 2006/03/06 22:18:45 glen
- fix md5
- avoid pipes to catch errors
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php-pear-PEAR.spec?r1=1.108&r2=1.109&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
