Author: glen Date: Wed Apr 12 13:54:45 2006 GMT Module: SOURCES Tag: AC-branch ---- Log message: - merge _noauto macros from HEAD/DEVEL
---- Files affected: SOURCES: php-pear-build-macros (1.17 -> 1.17.6.1) ---- Diffs: ================================================================ Index: SOURCES/php-pear-build-macros diff -u SOURCES/php-pear-build-macros:1.17 SOURCES/php-pear-build-macros:1.17.6.1 --- SOURCES/php-pear-build-macros:1.17 Tue Sep 27 23:17:42 2005 +++ SOURCES/php-pear-build-macros Wed Apr 12 15:54:40 2006 @@ -59,12 +59,13 @@ # bug in PEAR --installroot. \ # http://pear.php.net/bugs/bug.php?id=5448 \ grep -rl "${D}" ./{%{_bindir},%{php_pear_dir}}/* | xargs -r sed -i -e "s,${D},," \ +%{!?_noautocompressdoc:%global _noautocompressdoc %{nil}}%{expand:%%global _noautocompressdoc %{_noautocompressdoc} optional-packages.txt} \ +%{!?_noautoprov:%global _noautoprov %{nil}}%{expand:%%global _noautoprov %{_noautoprov} 'pear(tests/.*)'} \ %{nil} - -# copies exctracted PEAR package structure to buildroot. also copies PEAR -# registry file. -# please use this macro, for future expansions being possible. +# copies exctracted PEAR package structure to buildroot. +# also copies PEAR registry file. +# please use this macro, for future extensions being possible. %define pear_package_install() \ cp -a ./%{php_pear_dir}/{.registry,*} $RPM_BUILD_ROOT%{php_pear_dir} \ find $RPM_BUILD_ROOT%{php_pear_dir} '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v \ @@ -74,13 +75,3 @@ echo "_noautoreq $(cat _noautoreq)" \ fi \ %{nil} - -# default excludes for PEAR packages. -# if you need add something to the list use -# %%{expand:%%%%define _noautocompressdoc %%{_noautocompressdoc} otherexcludes} in your specfile. - -# this file displayed in %post -%define _noautocompressdoc optional-packages.txt - -# don't provide tests -%define _noautoprov 'pear(tests/.*)' ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/php-pear-build-macros?r1=1.17&r2=1.17.6.1&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
