SOURCES: php-pear-build-macros - add -z option to unpack tgz befor...

[glen]

Author: glen                         Date: Tue Sep 27 20:40:43 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- add -z option to unpack tgz before calling pear install for buggy packages like Image_Remote

---- Files affected:
SOURCES:
   php-pear-build-macros (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: SOURCES/php-pear-build-macros
diff -u SOURCES/php-pear-build-macros:1.14 SOURCES/php-pear-build-macros:1.15
--- SOURCES/php-pear-build-macros:1.14	Mon Sep 19 22:37:25 2005
+++ SOURCES/php-pear-build-macros	Tue Sep 27 22:40:37 2005
@@ -12,6 +12,7 @@
 #
 # -a #   - unpack SOURCE# instead of SOURCE0
 # -n FMT - create builddir with FMT, instead of default %%{_pearname}-%%{version}
+# -z     - unpack pear package and let pear use package.xml (not tarball) for install. use this for buggy packages.
 #
 # unpack PEAR package to %%{_builddir}/FMT. package is extracted with already
 # destination hierarchy. you should copy the tree to buildroot after
@@ -28,9 +29,10 @@
 # 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:) \
+%define pear_package_setup(a:n:z) \
 %setup -q -c -T -n %{-n*}%{!-n:%{_pearname}-%{version}}\
 D=%{_builddir}/%{-n*}%{!-n:%{_pearname}-%{version}} \
+%{-z:tar zxf %{S:%{-a*}%{!-a:0}}} \
 pear \\\
 	-d doc_dir=/docs \\\
 	-d php_dir=%{php_pear_dir} \\\
@@ -41,7 +43,7 @@
 	--installroot=${D} \\\
 	--offline \\\
 	--nodeps \\\
-	%{S:%{-a*}%{!-a:0}} | tee install.log \
+	%{!-z:%{S:%{-a*}%{!-a:0}}}%{-z:%{_pearname}-%{version}/package.xml} | 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 \
================================================================

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