ooo-build r12610 - in trunk: . bin

[rengelhard svn gnome org]

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

Log:
        * download.in, bin/unpack: handle the rename of swext-$tag to
          $tag-swext


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

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Tue May 20 22:15:14 2008
@@ -494,7 +494,11 @@
 fi
 
 if ! echo $CONFIGURE_OPTIONS $PROPAGATED_ARCHS | grep -q disable-mediawiki; then
-  SWEXT_PACKAGE=swext-$CVSTAG.tar.gz
+  if [ "`echo $CVSTAG | cut -d "-" -f2 | sed -e s/m//`" ge "13" ]; then
+      SWEXT_PACKAGE=$CVSTAG-swext.tar.gz
+  else
+      SWEXT_PACKAGE=swext-$CVSTAG.tar.gz
+  fi
   check_tarball $SRCDIR/$SWEXT_PACKAGE
   tar xfz $SRCDIR/$SWEXT_PACKAGE -C $OOBUILDDIR
 fi

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