ooo-build r12611 - in trunk: . bin

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue May 20 22:29:45 2008
New Revision: 12611
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12611&view=rev

Log:
fix

Modified:
   trunk/bin/unpack
   trunk/download.in

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue May 20 22:29:45 2008
@@ -495,12 +495,16 @@
 
 if ! echo $CONFIGURE_OPTIONS $PROPAGATED_ARCHS | grep -q disable-mediawiki; then
   if [ "`echo $CVSTAG | cut -d "-" -f2 | sed -e s/m//`" ge "13" ]; then
-      SWEXT_PACKAGE=$CVSTAG-swext.tar.gz
+      SWEXT_PACKAGE=$CVSTAG-swext.tar.bz2
   else
       SWEXT_PACKAGE=swext-$CVSTAG.tar.gz
   fi
   check_tarball $SRCDIR/$SWEXT_PACKAGE
-  tar xfz $SRCDIR/$SWEXT_PACKAGE -C $OOBUILDDIR
+  if echo $SWEXT_PACKAGE | grep -q bz2; then \
+      tar xfj $SRCDIR/$SWEXT_PACKAGE -C $OOBUILDDIR
+  else
+      tar xfz $SRCDIR/$SWEXT_PACKAGE -C $OOBUILDDIR
+  fi
 fi
 
 # OxygenOffice extras

Modified: trunk/download.in
==============================================================================
--- trunk/download.in	(original)
+++ trunk/download.in	Tue May 20 22:29:45 2008
@@ -247,14 +247,12 @@
 
 push @files, ( source_file( "core" ) );
 
-# TODO the following is to be source_file( "swext" ) when the tarball gets
-# renamed to @CVSTAG -swext tar bz2
-my $m = split(/-/, $tag);
-$m =~ s/m//;
-if ( $m >= "13" ) {
+my @m = split(/-/, '@CVSTAG@' );
+$m[1] =~ s/m//;
+if ( "$m[1]" >= "13" ) {
     push @files, ( source_file( "swext" ) );
-else {
-  push @files, ( 'swext- CVSTAG@.tar.gz' );
+} else {
+    push @files, ( 'swext- CVSTAG@.tar.gz' );
 }
 
 push @files, ( '@OOO_CUSTOM_IMAGES@') if '@OOO_CUSTOM_IMAGES@';