packages: rpm-build-macros/rpm.macros - use __tar macro - always extract pa...

[glen]

Author: glen                         Date: Fri Aug 20 20:26:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use __tar macro
- always extract package.xml/package2.xml in pear package prep

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.571 -> 1.572) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.571 packages/rpm-build-macros/rpm.macros:1.572
--- packages/rpm-build-macros/rpm.macros:1.571	Fri Aug 20 12:02:52 2010
+++ packages/rpm-build-macros/rpm.macros	Fri Aug 20 22:26:45 2010
@@ -1420,11 +1420,12 @@
 %define srcdir %{-n*}%{!-n:%{_pearname}-%{version}} \
 %define builddir %{_builddir}/%{srcdir} \
 %setup -q -c -T %{-D:-D} -n %{srcdir} \
-%{-z:tar zxf %{S:0}; %{-a:tar zxf %{S:%{-a*}}}} \
+%{-z:%{__tar} zxf %{S:0}; %{-a:%{__tar} zxf %{S:%{-a*}}}} \
 %{-z:_P=package2.xml; [ -f $_P ] || _P=package.xml; _N=%{srcdir}; mv $_P $_N; cd $_N} \
 %{-c:%{__pear} -c pearrc config-set php_dir %{builddir}/%{php_pear_dir}; %__pear -c %{builddir}/pearrc channel-add %{-c*}} \
 %pear_install \
 %{-z:cd ..} \
+%{__tar} --wildcards -zvxf %{S:0} package*.xml \
 cat %{-z:$_N/}.install.log | %__pear_install_log \
 \
 # undos sources \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.571&r2=1.572&f=u