- do not filter pear install message too much

Changed files:
    rpm-build-macros.spec -> 1.292
    rpm.macros -> 1.610

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 7d71661e88d6264ca542c9bea67213396b430eaf..4e9201e1bf2efa260d15f1b0c3fd4f6dbbe99007 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.609
+%define                rpm_macros_rev  1.610
 %define                find_lang_rev   1.34
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index 3b229106742f19e594dc7dabeb0ff475483bfcf8..3b02732f27b78fcbf0bb9633b69bcbe2b9a18bd3 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1426,7 +1426,7 @@ echo -e "</dependencies>\\n" >> %{_mavendepmapdir}/maven2-depmap.xml
 %__pear_install_log \
 tee install.log \
 # make post message of optional packages \
-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 \
+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-,' > 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 \