From: Elan Ruusamäe <glen@pld-linux.org>
Date: Thu, 20 May 2010 17:52:29 +0000 (+0000)
Subject: - update to PEAR 1.9.0
X-Git-Tag: auto/ac/rpm-build-macros-1_563-1~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm-build-macros.git;a=commitdiff_plain;h=5ad4663a611b782181b0d38979be572a369ee49f

- update to PEAR 1.9.0

Changed files:
    rpm.macros -> 1.563
---

diff --git a/rpm.macros b/rpm.macros
index 44e68e2..000e83f 100644
--- a/rpm.macros
+++ b/rpm.macros
@@ -1377,7 +1377,7 @@ echo -e "</dependencies>\\n" >> %{_mavendepmapdir}/maven2-depmap.xml
 %__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-,;s,^pear/,php-pear-,;s,^channel://.*/,,' > optional-packages.txt \
+grep -E 'can optionally use|Optional feature' install.log | sed -e 's,package "pear/,package "php-pear-,g;s,^pear/,php-pear-,;s,^pear/,php-pear-,;s,^channel://.*/,,' > optional-packages.txt \
 if [ -s optional-packages.txt ]; then \
 	awk -F'"' '/use package/{print $2}' optional-packages.txt | sed -e "s,_,/,g;s,php-pear-, 'pear(,;s,$,.*)'," | tr -d '\\\n' > _noautoreq \
 else \