SOURCES: php-pear-build-macros - nocompress optional-packages.txt ...

glen glen at pld-linux.org
Sun Sep 18 14:51:15 CEST 2005


Author: glen                         Date: Sun Sep 18 12:51:15 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- nocompress optional-packages.txt
- PLD names for pear packages

---- Files affected:
SOURCES:
   php-pear-build-macros (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/php-pear-build-macros
diff -u SOURCES/php-pear-build-macros:1.2 SOURCES/php-pear-build-macros:1.3
--- SOURCES/php-pear-build-macros:1.2	Sun Sep 18 13:48:33 2005
+++ SOURCES/php-pear-build-macros	Sun Sep 18 14:51:10 2005
@@ -12,7 +12,8 @@
 	--nodeps \\\
 	%{S:%{-a*}%{!-a:0}} | tee install.log \
 # make post message of optional packages \
-grep 'can optionally use package' install.log > optional-packages.txt \
+grep 'can optionally use package' install.log | sed -e 's,pear/,php-pear-,g' > optional-packages.txt \
+test -s optional-packages.txt || rm -f optional-packages.txt \
 rm ./%{php_pear_dir}/.{lock,filemap} \
 # undos sources \
 find . -type f -print0 | xargs -0 sed -i -e 's,\\r$,,' \
@@ -24,3 +25,6 @@
 %define	pear_package_install() \
 cp -a ./%{php_pear_dir}/{.registry,*} $RPM_BUILD_ROOT%{php_pear_dir} \
 %{nil}
+
+# displayed in post
+%define _noautocompressdoc optional-packages.txt
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-pear-build-macros?r1=1.2&r2=1.3&f=u




More information about the pld-cvs-commit mailing list