rpms/openoffice.org/devel openoffice.org.spec,1.677,1.678
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Apr 28 19:54:47 UTC 2006
- Previous message (by thread): rpms/thunderbird/FC-5 .cvsignore, 1.10, 1.11 sources, 1.13, 1.14 thunderbird.spec, 1.68, 1.69 firefox-1.5.0.1-dumpstack.patch, 1.1, NONE firefox-bug305970.patch, 1.1, NONE thunderbird-1.5-bug304720.patch, 1.1, NONE
- Next message (by thread): rpms/cairo-java/devel .cvsignore, 1.6, 1.7 cairo-java.spec, 1.25, 1.26 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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 ../..
- Previous message (by thread): rpms/thunderbird/FC-5 .cvsignore, 1.10, 1.11 sources, 1.13, 1.14 thunderbird.spec, 1.68, 1.69 firefox-1.5.0.1-dumpstack.patch, 1.1, NONE firefox-bug305970.patch, 1.1, NONE thunderbird-1.5-bug304720.patch, 1.1, NONE
- Next message (by thread): rpms/cairo-java/devel .cvsignore, 1.6, 1.7 cairo-java.spec, 1.25, 1.26 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list