rpms/openoffice.org/devel openoffice.org.spec,1.1053,1.1054

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
install time failure, me looks suspiciously at new gij


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1053
retrieving revision 1.1054
diff -u -r1.1053 -r1.1054
--- openoffice.org.spec	21 Feb 2007 20:43:55 -0000	1.1053
+++ openoffice.org.spec	22 Feb 2007 09:04:14 -0000	1.1054
@@ -1086,7 +1086,24 @@
 #get an unpackaged raw install
 export PKGFORMATSWITCH="-format rpm -simple $RPM_BUILD_ROOT/%{instdir}"
 echo start en-US install time is `date`, diskspace: `df -h . | tail -n 1`
-dmake openoffice_en-US
+if ! dmake openoffice_en-US; then
+    echo parallel openoffice_en-US failure, diskspace: `df -h . | tail -n 1` - restarting unparallel build...
+    echo - ---dump log start---
+    cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log
+    echo - ---dump log end---
+    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---
+        cat ../unx*.pro/OpenOffice/rpm/logging/en-US/log_*__en-US.log
+        echo - ---dump log end---
+        echo - ---debug jar start---
+        for i in ../../solver/680/*/bin/*.jar; do unzip -l $i; done
+        echo - ---debug jar end---
+        rm -rf ../../solver/680/*/bin/*.jar
+        build --dlv_switch -link --all
+        dmake openoffice_en-US
+    fi
+fi
 echo end en-US install time is `date`, diskspace: `df -h . | tail -n 1`
 %if %{langpacks}
 echo start langpack install time is `date`, diskspace: `df -h . | tail -n 1`