ooo-build r13533 - in trunk: . bin

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Aug 12 19:31:00 2008
New Revision: 13533
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13533&view=rev

Log:
2008-08-12  Kohei Yoshida  <kyoshida novell com>

	* bin/unpack: check the presence of scsolver package *before* we start 
	unpacking.


Modified:
   trunk/ChangeLog
   trunk/bin/unpack

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue Aug 12 19:31:00 2008
@@ -68,6 +68,10 @@
 	check_tarball $OOO_TARBALL
 fi
 
+# Check presence of scsolver (Calc Solver) package...
+SCSOLVER_PACKAGE=scsolver.2008-08-12.tar.bz2
+check_tarball $SRCDIR/$SCSOLVER_PACKAGE
+
 mkdir -p $BUILDDIR
 cd $BUILDDIR
 
@@ -587,9 +591,8 @@
   tar xfj $SRCDIR/$SWEXT_PACKAGE -C $OOBUILDDIR
 fi
 
-# Calc Solver
-SCSOLVER_PACKAGE=scsolver.2008-08-12.tar.bz2
-check_tarball $SRCDIR/$SCSOLVER_PACKAGE
+# Unpack the scsolver package
+echo "Unpacking $SCSOLVER_PACKAGE"
 tar xfj $SRCDIR/$SCSOLVER_PACKAGE -C $OOBUILDDIR
 
 # OxygenOffice extras