From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sun, 18 Sep 2005 12:51:10 +0000 (+0000)
Subject: - nocompress optional-packages.txt
X-Git-Tag: auto/th/rpm-4_4_2-4~2
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=ea5a95d23b97ef3691c783027267765d790dd080;p=packages%2Frpm.git

- 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 d75b9e8..a0e792a 100644
--- 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