SPECS: openoffice.org.spec - avoid errors when %{__make} ends with...

[glen]

Author: glen                         Date: Wed Nov  1 22:30:27 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- avoid errors when %{__make} ends with space

---- Files affected:
SPECS:
   openoffice.org.spec (1.615 -> 1.616) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.615 SPECS/openoffice.org.spec:1.616
--- SPECS/openoffice.org.spec:1.615	Wed Nov  1 23:06:20 2006
+++ SPECS/openoffice.org.spec	Wed Nov  1 23:30:22 2006
@@ -1966,7 +1966,7 @@
 export DEFAULT_TO_ENGLISH_FOR_PACKING=1
 
 RPM_BUILD_NR_THREADS="%(echo "%{__make}" | sed -e 's#.*-j\([[:space:]]*[0-9]\+\)#\1#g' | xargs)"
-[ "$RPM_BUILD_NR_THREADS" = "%{__make}" ] && RPM_BUILD_NR_THREADS=1
+[ "$RPM_BUILD_NR_THREADS" = "$(echo %{__make})" ] && RPM_BUILD_NR_THREADS=1
 
 CONFOPTS=" \
 %ifarch %{ix86} \
@@ -2082,6 +2082,7 @@
 :> distro-configs/Common.conf
 :> distro-configs/Common.conf.in
 echo "$CONFOPTS" > distro-configs/${DISTRO}.conf.in
+echo "$CONFOPTS" > distro-configs/${DISTRO}64.conf.in
 
 # for cvs snaps
 [ -x ./autogen.sh ] && ./autogen.sh $CONFOPTS
@@ -2491,6 +2492,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.616  2006/11/01 22:30:22  glen
+- avoid errors when %{__make} ends with space
+
 Revision 1.615  2006/11/01 22:06:20  glen
 - gstreamer 0.10 deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.615&r2=1.616&f=u