rpms/openoffice.org/devel openoffice.org.spec,1.677,1.678

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20352

Modified Files:
	openoffice.org.spec 
Log Message:
failsafe on bad jars


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.677
retrieving revision 1.678
diff -u -r1.677 -r1.678
--- openoffice.org.spec	27 Apr 2006 14:33:58 -0000	1.677
+++ openoffice.org.spec	28 Apr 2006 19:54:45 -0000	1.678
@@ -1274,6 +1274,7 @@
     cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log
     echo - ---dump log end---
     unset MAXPROCESS
+    build --dlv_switch -link --all
     if ! dmake openoffice_en-US; then
         echo unparallel openoffice_en-US failure, diskspace: `df -h . | tail -n 1` - trying one last time...
         echo - ---dump log start---
@@ -1285,11 +1286,7 @@
 echo end en-US install time is `date`
 %if %{langpacks}
 echo start langpack install time is `date`
-if ! dmake ooolanguagepack; then
-    echo parallel ooolanguagepack failure, diskspace: `df -h . | tail -n 1` - restarting unparallel build...
-    unset MAXPROCESS
-    dmake ooolanguagepack
-fi
+dmake ooolanguagepack
 echo end langpack install time is `date`, diskspace: `df -h . | tail -n 1`
 %endif
 cd ../..