- nocompress optional-packages.txt

- PLD names for pear packages

Changed files:
    php-pear-build-macros -> 1.3

diff --git a/php-pear-build-macros b/php-pear-build-macros
index d75b9e8b6d00feac4e710bd2a14d62cecbe9312c..a0e792a487945246f56619e98ce87720c2f7fce8 100644 (file)
--- a/php-pear-build-macros
+++ b/php-pear-build-macros
@@ -12,7 +12,8 @@ sh %{_bindir}/pear \\\
        --nodeps \\\
        %{S:%{-a*}%{!-a:0}} | tee install.log \
 # make post message of optional packages \
-grep 'can optionally use package' install.log > optional-packages.txt \
+grep 'can optionally use package' install.log | sed -e 's,pear/,php-pear-,g' > optional-packages.txt \
+test -s optional-packages.txt || rm -f optional-packages.txt \
 rm ./%{php_pear_dir}/.{lock,filemap} \
 # undos sources \
 find . -type f -print0 | xargs -0 sed -i -e 's,\\r$,,' \
@@ -24,3 +25,6 @@ grep -rl "${D}" ./{%{_bindir},%{php_pear_dir}}/* | xargs -r sed -i -e "s,${D},,"
 %define        pear_package_install() \
 cp -a ./%{php_pear_dir}/{.registry,*} $RPM_BUILD_ROOT%{php_pear_dir} \
 %{nil}
+
+# displayed in post
+%define _noautocompressdoc optional-packages.txt