packages: rpm-build-macros/rpm.macros - dont overwrite %__cmake, %__scons, ...

[sparky]

Author: sparky                       Date: Tue Nov 17 15:51:58 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dont overwrite %__cmake, %__scons, %__waf with versions without %{?_smp_mflags}

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.524 -> 1.525) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.524 packages/rpm-build-macros/rpm.macros:1.525
--- packages/rpm-build-macros/rpm.macros:1.524	Fri Oct 16 07:41:34 2009
+++ packages/rpm-build-macros/rpm.macros	Tue Nov 17 16:51:52 2009
@@ -199,7 +199,6 @@
 	%{dependencytracking} \
 }
 
-%__cmake	/usr/bin/cmake
 %cmake { \
 CC="%{__cc}" \
 CXX="%{__cxx}" \
@@ -209,8 +208,6 @@
 %{__cmake} \
 }
 
-# override __scons to add -j4 in your ~/.rpmmacros for parallel make
-%__scons	/usr/bin/scons
 %scons { \
 %{__scons} \
 	LDFLAGS="${LDFLAGS:-%rpmldflags}" \
@@ -225,8 +222,6 @@
 }
 
 # waf. see waf.spec
-# override __waf to add -j4 in your ~/.rpmmacros for parallel make
-%__waf	/usr/bin/waf
 %waf { \
 CC="%{__cc}" \
 CXX="%{__cxx}" \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.524&r2=1.525&f=u