SPECS: openoffice.org.spec - i believe there was wrong variable us...

[glen]

Author: glen                         Date: Wed Nov  1 22:34:53 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- i believe there was wrong variable used instead of RPM_BUILD_NR_THREADS
- cosmetics

---- Files affected:
SPECS:
   openoffice.org.spec (1.617 -> 1.618) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.617 SPECS/openoffice.org.spec:1.618
--- SPECS/openoffice.org.spec:1.617	Wed Nov  1 23:32:06 2006
+++ SPECS/openoffice.org.spec	Wed Nov  1 23:34:47 2006
@@ -2078,7 +2078,7 @@
 "
 
 # build-ooo script will pickup these
-CONFIGURE_OPTIONS="$CONFOPTS"; export CONFIGURE_OPTIONS
+export CONFIGURE_OPTIONS="$CONFOPTS"
 
 :> distro-configs/Common.conf
 :> distro-configs/Common.conf.in
@@ -2097,7 +2097,7 @@
 %{__make} -j1
 
 # hack for parallel build
-if [ "$RPM_BUILD_NCPUS" -gt 1 ]; then
+if [ $RPM_BUILD_NR_THREADS -gt 1 ]; then
 	doit=1
 	while [ "$doit" -eq 1 ]; do
 		echo "Waiting one more time..."
@@ -2110,12 +2110,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 # limit to single process installation, it's safe at least
-sed -i -e 's#^BUILD_NCPUS=.*#BUILD_NCPUS=1#g' bin/setup
+%{__sed} -i -e 's#^BUILD_NCPUS=.*#BUILD_NCPUS=1#g' bin/setup
 
-DESTDIR=$RPM_BUILD_ROOT; export DESTDIR
-TMP="%{tmpdir}"; export TMP
-TEMP="%{tmpdir}"; export TEMP
-DEFAULT_TO_ENGLISH_FOR_PACKING=1; export DEFAULT_TO_ENGLISH_FOR_PACKING
+export DESTDIR=$RPM_BUILD_ROOT
+export TMP="%{tmpdir}"
+export TEMP="%{tmpdir}"
+export DEFAULT_TO_ENGLISH_FOR_PACKING=1
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -2493,6 +2493,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.618  2006/11/01 22:34:47  glen
+- i believe there was wrong variable used instead of RPM_BUILD_NR_THREADS
+- cosmetics
+
 Revision 1.617  2006/11/01 22:32:06  glen
 - more accurate check for RPM_BUILD_NR_THREADS
 
================================================================

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