- update to rpm-4.4.6

[packages/rpm.git] / php-pear-build-macros

diff --git a/php-pear-build-macros b/php-pear-build-macros
index 04b959ce0d97978e6c08db022f4e0aa46c38eae2..d5fb7cc9bca58529f012cc36f4987635d01342a4 100644 (file)
--- a/php-pear-build-macros
+++ b/php-pear-build-macros
@@ -10,8 +10,9 @@
 # Usage:
 #      %%pear_package_setup [-a #] [-n FMT]
 #
-# -a #   - unpack SOURCE# instead of SOURCE0
+# -a #   - also unpack SOURCE#. for PEAR bootstrapping
 # -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. for PEAR bootstrapping
 #
 # unpack PEAR package to %%{_builddir}/FMT. package is extracted with already
 # destination hierarchy. you should copy the tree to buildroot after
@@ -27,21 +28,11 @@
 # package has optional dependencies. the file format is suitable of displaying
 # 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:) \
-%setup -q -c -T -n %{-n*}%{!-n:%{_pearname}-%{version}}\
-D=%{_builddir}/%{-n*}%{!-n:%{_pearname}-%{version}} \
-pear \\\
-       -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} \\\
-       --offline \\\
-       --nodeps \\\
-       %{S:%{-a*}%{!-a:0}} | tee install.log \
+
+
+# records install.log and transforms PEAR names to PLD Linux rpm package names.
+%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 \
@@ -49,33 +40,49 @@ if [ -s optional-packages.txt ]; then \
 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$,,' \
-# 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},," \
-%{nil}
 
+# command invoking pear cli
+%define        __pear /usr/bin/pear
 
-# copies exctracted PEAR package structure to buildroot. also copies PEAR
-# registry file.
-# please use this macro, for future expansions being possible.
+# the main macro.
+# using this macro will append optional-packages.txt to the nocompressdoc list
+# as it's displayed to user after package install. and adding additional gzip
+# dep is just waste ;)
+%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: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 \\\
+       --packagingroot=${_D} \\\
+       --offline \\\
+       --nodeps \\\
+       %{-f:--force} \\\
+       %{!-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 \
+%{!?_noautocompressdoc:%global _noautocompressdoc %{nil}}%{expand:%%global _noautocompressdoc %{_noautocompressdoc} optional-packages.txt} \
+%{!?_noautoprov:%global _noautoprov %{nil}}%{expand:%%global _noautoprov %{_noautoprov} 'pear(tests/.*)'} \
+%{nil}
+
+# copies exctracted PEAR package structure to buildroot.
+# also copies PEAR registry file.
+# please use this macro, for future extensions being possible.
 %define pear_package_install() \
 cp -a ./%{php_pear_dir}/{.registry,*} $RPM_BUILD_ROOT%{php_pear_dir} \
+find $RPM_BUILD_ROOT%{php_pear_dir} '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v \
 # help the developer out a little: \
 if [ -f _noautoreq ]; then \
        echo "AutoReqdep detected:" \
        echo "_noautoreq $(cat _noautoreq)" \
 fi \
 %{nil}
-
-# default excludes for PEAR packages.
-# if you need add something to the list use
-# %%{expand:%%%%define _noautocompressdoc %%{_noautocompressdoc} otherexcludes} in your specfile.
-
-# this file displayed in %post
-%define _noautocompressdoc optional-packages.txt
-
-# don't provide tests
-%define _noautoprov 'pear(tests/.*)'