packages: rpm-build-macros/rpm.macros - update to PEAR 1.9.0
glen
glen at pld-linux.org
Thu May 20 19:52:34 CEST 2010
Author: glen Date: Thu May 20 17:52:34 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- update to PEAR 1.9.0
---- Files affected:
packages/rpm-build-macros:
rpm.macros (1.562 -> 1.563)
---- Diffs:
================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.562 packages/rpm-build-macros/rpm.macros:1.563
--- packages/rpm-build-macros/rpm.macros:1.562 Fri May 14 17:56:04 2010
+++ packages/rpm-build-macros/rpm.macros Thu May 20 19:52:29 2010
@@ -1377,7 +1377,7 @@
%__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 \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.562&r2=1.563&f=u
More information about the pld-cvs-commit
mailing list