rpms/openoffice.org/devel openoffice.org.spec,1.1425,1.1426

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32359

Modified Files:
	openoffice.org.spec 
Log Message:
Resolves: rhbz#432368 dial down parallel


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1425
retrieving revision 1.1426
diff -u -r1.1425 -r1.1426
--- openoffice.org.spec	12 Feb 2008 20:18:29 -0000	1.1425
+++ openoffice.org.spec	13 Feb 2008 09:31:28 -0000	1.1426
@@ -1,6 +1,6 @@
 %define oootag OOH680
-%define ooomilestone 6
-%define rh_rpm_release 3
+%define ooomilestone 7
+%define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
 %define langpacks 1
@@ -1145,6 +1145,9 @@
 SMP_MFLAGS=%{?_smp_mflags}
 SMP_MFLAGS=-P$[${SMP_MFLAGS/-j/}]
 if [ "$SMP_MFLAGS" == "-P0" ]; then SMP_MFLAGS=-P2; fi
+XSMP_MFLAGS=$[${SMP_MFLAGS/-P/}]
+if [ $XSMP_MFLAGS -gt 4 ]; then XSMP_MFLAGS=4; fi
+XSMP_MFLAGS=-P$XSMP_MFLAGS
 #just in case you have a >16 proc box
 export MAXPROCESSLIMIT=65535
 #get core dumps
@@ -1152,7 +1155,7 @@
 #build translation tools and apply extra translations, so
 #this can be removed when these translations are upstreamed
 cd transex3/prj
-if ! build --dlv_switch -link --all $SMP_MFLAGS -- $SMP_MFLAGS -s; then
+if ! build --dlv_switch -link --all $XSMP_MFLAGS -- $SMP_MFLAGS -s; then
     echo bt > gdbcmds
     find ../.. -name "core.*" -exec gdb --batch -nx -x gdbcmds --core {} \;
     build --dlv_switch -link --all
@@ -2864,6 +2867,10 @@
 
 
 %changelog
+* Wed Feb 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-7.1
+- Resolves: rhbz#432368 parallel build is err... "a little" aggressive
+- next milestone
+
 * Tue Feb 12 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-6.3
 - Resolves: rhbz#431805 openoffice.org-2.4.0.ooo85931.svx.getentrypos.patch
 - Resolves: rhbz#431620 presentation problems