[ooo-build-commit] .: 2 commits - bin/Makefile.am bin/setup.in bin/unpack download.in src/.gitignore

[Petr Mladek]

 bin/Makefile.am |    2 +-
 bin/setup.in    |    6 +++---
 bin/unpack      |    8 ++++----
 download.in     |   11 +++++------
 src/.gitignore  |    1 +
 5 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit 2cdfa7afd0324b14e23d47c32867d6026ade641a
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Sep 28 17:50:50 2010 +0200

    pack the new lo-pack-sources

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 6120f76..1214c7f 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -30,7 +30,7 @@ script_files = \
 	ootesttool.in \
 	ootool.in \
 	ootouch \
-	ooo-pack-sources \
+	lo-pack-sources \
 	ooo-unpack-sources \
 	openoffice-xlate-lang \
 	owner \
commit dd34119794ea2dca372ceb7152b6e8630467291f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Sep 28 17:13:42 2010 +0200

    allow build with released libreoffice source tarballs

diff --git a/bin/setup.in b/bin/setup.in
index 6670dcc..33dd5f2 100755
--- a/bin/setup.in
+++ b/bin/setup.in
@@ -303,9 +303,9 @@ else
 fi
 OOO_SPLIT_PREFIX=""
 if test "z at SPLIT@" = "zyes"; then
-    OOO_SPLIT_PREFIX="ooo-build-$OOO_SOURCEVERSION-"
-    OOO_SDK_OO_TARBALL="ooo-build-$OOO_SOURCEVERSION-sdk.tar.bz2"
-    OOO_SYSTEM_TARBALL="ooo-build-$OOO_SOURCEVERSION-libs-extern-sys.tar.bz2"
+    OOO_SPLIT_PREFIX="libreoffice-"
+    OOO_SDK_OO_TARBALL="libreoffice-sdk-$OOO_SOURCEVERSION.tar.bz2"
+    OOO_SYSTEM_TARBALL="libreoffice-libs-extern-sys-$OOO_SOURCEVERSION.tar.bz2"
     OOO_TARBALL=not-there-at-all
     OOO_LANG_TARBALL=not-there-at-all
     OOO_BINFILTER_TARBALL=not-there-at-all
diff --git a/bin/unpack b/bin/unpack
index 5504cae..6456f4b 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -95,7 +95,7 @@ if test "z$OOO_GIT" = "z" ; then
 	    CORE_PKGS="$CORE_PKGS l10n"
 	fi
 	for pkg in $CORE_PKGS; do
-	    check_tarball "$OOO_SPLIT_PREFIX$pkg.tar.bz2"
+	    check_tarball "$OOO_SPLIT_PREFIX$pkg-$OOO_SOURCEVERSION.tar.bz2"
 	done
     # this is the legacy source splitting
     else
@@ -265,10 +265,10 @@ if test "z$OOO_GIT" = "z" ; then
 	fi
 	for pkg in $CORE_PKGS; do
             echo "	unpacking $pkg..."
-            ($OOO_DECOMPRESS_CMD "$SRCDIR/$OOO_SPLIT_PREFIX$pkg.tar.bz2" | $GNUTAR xpf - ) || exit 1
+            ($OOO_DECOMPRESS_CMD "$SRCDIR/$OOO_SPLIT_PREFIX$pkg-$OOO_SOURCEVERSION.tar.bz2" | $GNUTAR xpf - ) || exit 1
             echo "	moving it into place..."
-            mv $OOO_SPLIT_PREFIX$pkg/* $OOBUILDDIR
-            rmdir $OOO_SPLIT_PREFIX$pkg
+            mv $OOO_SPLIT_PREFIX$pkg-$OOO_SOURCEVERSION/* $OOBUILDDIR
+            rmdir $OOO_SPLIT_PREFIX$pkg-$OOO_SOURCEVERSION
 	done
 	if test "z$PIECE" != "z"; then
             if test "$SOURCE_TYPE" = "CGIT" ; then
diff --git a/download.in b/download.in
index 1d4c6ac..2737f82 100755
--- a/download.in
+++ b/download.in
@@ -18,7 +18,7 @@ sub webget($$$$)
         # helper tool to repack ooo piece sources from cgit
         my $ooo_pack_sources = '@TOOLSDIR@' . "/bin/ooo-pack-sources";
 
-        print "Get $src -> $dest/libreoffice-${ooo_sourceversion}-$name.tar.bz2\n";
+        print "Get $src -> $dest/libreoffice-$name-${ooo_sourceversion}.tar.bz2\n";
 
         # first try to get the tarball into a temporary directory
         my $tempdir = tempdir( '/tmp/libreoffice-download-XXXXXX' );
@@ -94,8 +94,8 @@ sub download_tests_dependencies() {
     'http:\/\/.*'                        => '',
     'binutils-.*'                        => '@MIRROR@/support',
     'gcc-.*'                             => '@MIRROR@/support',
-    'libreoffice-3.2.9.*'                  => '@MIRROR@/3.3',
-    'libreoffice-3.3.0.*'                  => '@MIRROR@/3.3',
+    'libreoffice-.*-3.2.9.*'             => 'http://download.documentfoundation.org/libreoffice/src/',
+    'libreoffice-.*-3.3.0.*'             => 'http://download.documentfoundation.org/libreoffice/src/',
     'beb300-m.*'                         => '@MIRROR@/BEB300',
     'dev300-m.*'                         => '@MIRROR@/DEV300',
     'ooo300-m.*'                         => '@MIRROR@/OOO300',
@@ -182,7 +182,6 @@ sub download_tests_dependencies() {
 
 # Numbertext extension
     'numbertext-*'                       => 'http://ftp.fsf.hu/OpenOffice.org_hu/numbertext/',
-
 # Hungarian Cross-reference toolbar extension
     'hunart-*'                           => 'http://ftp.fsf.hu/OpenOffice.org_hu/hunart/',
 
@@ -305,7 +304,7 @@ sub source_file_ooo($)
         source_file( "http://cgit.freedesktop.org/libreoffice/$what/snapshot/$git_tag.tar.bz2", $what, 1);
     }
     else {
-        source_file( "libreoffice-" . '@OOO_SOURCEVERSION@' . "-$what.tar.bz2" );
+        source_file( "libreoffice-$what-" . '@OOO_SOURCEVERSION@' . ".tar.bz2" );
     }
 }
 
@@ -328,7 +327,7 @@ sub download_files($$$)
                 if ( $save_as ne '' ) {
                     if ($is_cgit) {
                         # it must be libreoffice piece source; $save_as include just a file name
-                        $to_check = "$dest/libreoffice-" . '@OOO_SOURCEVERSION@' . "-$save_as.tar.bz2";
+                        $to_check = "$dest/libreoffice-$save_as-" . '@OOO_SOURCEVERSION@' . ".tar.bz2";
                     } else {
                         # $save_as provides full file name
                         $to_check = "$dest/$save_as";
diff --git a/src/.gitignore b/src/.gitignore
index c531de5..3fb1117 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,5 +1,6 @@
 *.dll
 *.jar
+*.md5
 *.oxt
 *.sdf
 *.sdf.bz2