packages: rpm-build-macros/rpm-build-macros.spec, rpm-build-macros/rpm.macr...

[glen]

Author: glen                         Date: Sat Apr  9 13:54:13 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- do not filter pear install message too much

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.291 -> 1.292) , rpm.macros (1.609 -> 1.610) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.291 packages/rpm-build-macros/rpm-build-macros.spec:1.292
--- packages/rpm-build-macros/rpm-build-macros.spec:1.291	Thu Feb 24 12:17:49 2011
+++ packages/rpm-build-macros/rpm-build-macros.spec	Sat Apr  9 15:54:08 2011
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%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
@@ -90,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.292  2011/04/09 13:54:08  glen
+- do not filter pear install message too much
+
 Revision 1.291  2011/02/24 11:17:49  glen
 - release 1
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.609 packages/rpm-build-macros/rpm.macros:1.610
--- packages/rpm-build-macros/rpm.macros:1.609	Thu Feb 24 12:17:35 2011
+++ packages/rpm-build-macros/rpm.macros	Sat Apr  9 15:54:08 2011
@@ -1426,7 +1426,7 @@
 %__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 \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.291&r2=1.292&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.609&r2=1.610&f=u