- add -f for pear_package_setup, allow package.xml outside subdir

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

diff --git a/php-pear-build-macros b/php-pear-build-macros
index 7bcc6c0bdce78ba88ab0ad91f962bb7d81bab173..7e508a5034b9b74077bb4328fb5b2eac52d27858 100644 (file)
--- a/php-pear-build-macros
+++ b/php-pear-build-macros
@@ -1,5 +1,9 @@
 # vim:syn=spec:ai
 
+# original macros.php macros
+%define        __php_provides  /usr/lib/rpm/php.prov
+%define        __php_requires  /usr/lib/rpm/php.req
+
 # pear install macros written by glen@pld-linux.org.
 # All rights reserved. Permission to copy is hereby granted.. yada, yada, yada
 #
@@ -8,6 +12,8 @@
 #
 # -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.
+# -f     - force pear install. use with care.
 #
 # unpack PEAR package to %%{_builddir}/FMT. package is extracted with already
 # destination hierarchy. you should copy the tree to buildroot after
@@ -24,9 +30,10 @@
 # in %%post of a package. you should put this file to %%doc. noautocompressdoc is
 # automatically added for this file.
 #
-%pear_package_setup(a:n:) \
+%define pear_package_setup(a:n:zf) \
 %setup -q -c -T -n %{-n*}%{!-n:%{_pearname}-%{version}}\
 D=%{_builddir}/%{-n*}%{!-n:%{_pearname}-%{version}} \
+%{-z:tar zxf %{S:%{-a*}%{!-a:0}}; P=%{_pearname}-%{version}/package.xml; [ -f $P ] || P=package.xml} \
 pear \\\
        -d doc_dir=/docs \\\
        -d php_dir=%{php_pear_dir} \\\
@@ -37,11 +44,12 @@ pear \\\
        --installroot=${D} \\\
        --offline \\\
        --nodeps \\\
-       %{S:%{-a*}%{!-a:0}} | tee install.log \
+       %{-f:--force} \\\
+       %{!-z:%{S:%{-a*}%{!-a:0}}}%{-z:$P} | tee install.log \
 # make post message of optional packages \
-grep 'can optionally use package' install.log | sed -e 's,pear/,php-pear-,g' > optional-packages.txt \
+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 \
-       awk -F'"' '{print $2}' optional-packages.txt | sed -e "s,_,/,g;s,php-pear-, 'pear(,;s,$,.*)'," | tr -d '\\\n' > _noautoreq \
+       awk -F'"' '/use package/{print $2}' optional-packages.txt | sed -e "s,_,/,g;s,php-pear-, 'pear(,;s,$,.*)'," | tr -d '\\\n' > _noautoreq \
 else \
        rm -f optional-packages.txt \
 fi \
@@ -57,8 +65,9 @@ grep -rl "${D}" ./{%{_bindir},%{php_pear_dir}}/* | xargs -r sed -i -e "s,${D},,"
 # copies exctracted PEAR package structure to buildroot. also copies PEAR
 # registry file.
 # please use this macro, for future expansions being possible.
-%pear_package_install() \
+%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:" \
@@ -71,7 +80,7 @@ fi \
 # %%{expand:%%%%define _noautocompressdoc %%{_noautocompressdoc} otherexcludes} in your specfile.
 
 # this file displayed in %post
-%_noautocompressdoc optional-packages.txt
+%define _noautocompressdoc optional-packages.txt
 
 # don't provide tests
-%_noautoprov 'pear(tests/.*)'
+%define _noautoprov 'pear(tests/.*)'