SOURCES: rpm.macros - handle channel://URI in install.log for pear

glen glen at pld-linux.org
Tue Aug 26 15:59:01 CEST 2008


Author: glen                         Date: Tue Aug 26 13:59:01 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- handle channel://URI in install.log for pear

---- Files affected:
SOURCES:
   rpm.macros (1.473 -> 1.474) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.473 SOURCES/rpm.macros:1.474
--- SOURCES/rpm.macros:1.473	Tue Aug 26 15:49:53 2008
+++ SOURCES/rpm.macros	Tue Aug 26 15:58:55 2008
@@ -1133,7 +1133,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-,' > optional-packages.txt \
+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 \
 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/SOURCES/rpm.macros?r1=1.473&r2=1.474&f=u



More information about the pld-cvs-commit mailing list