[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - bin/piece bin/unpack download.in patches/dev300

[Petr Mladek]

 bin/piece/file-list-help    |    4 ++++
 bin/piece/install-bootstrap |    1 -
 bin/piece/post-inst-ure     |    6 ++++--
 bin/unpack                  |    2 +-
 download.in                 |    2 +-
 patches/dev300/apply        |    2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 2d3816cf9147089d82b051301a54ba6433ad1aa0
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Nov 10 20:17:11 2010 +0100

    put the user configuration into ~/.libreoffice/3-suse in SUSE builds
    
    the system BerkleyBD is not compatible with the internal one;
    soffice creashes on start when there are incompatible
    .rdb file in the user configuration

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 4fbcf14..437ddd0 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -603,7 +603,7 @@ scp2-user-config-ooo3.diff, pmladek
 
 # change user config dir name from ~/.openoffice.org3 to ~/.ooo3
 # FIXME: do we want another config dir for the Novell buidls?
-#scp2-user-config-suse.diff, pmladek
+scp2-user-config-suse.diff, pmladek
 
 # link against the versioned libmysqlcppconn
 # we do not want to require the devel package
commit 85c3465598186739f2537cc7150e0507de591f54
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Nov 10 20:15:17 2010 +0100

    split build fixes
    
    also updated the prebuilt setup_native_packinfo to 3.2.99.3

diff --git a/bin/piece/file-list-help b/bin/piece/file-list-help
index d3222bd..52811c0 100755
--- a/bin/piece/file-list-help
+++ b/bin/piece/file-list-help
@@ -19,6 +19,10 @@ remove_dir "files-$piece.txt" $OO_INSTDIR/ure
 # remove the duplicated .zip archives
 rm -rf $DESTDIR$OO_SOLVERDIR/pck/*.zip
 
+# prune redundant files the scp2 likes to make for us
+remove_file "files-$piece.txt" "$OO_INSTDIR/basis-link"
+remove_file "files-$piece.txt" "$OO_INSTDIR/share/extensions/package.txt"
+
 # move the stuff to /usr/share when enabled
 if test "$OOO_BUILD_NOARCH" = 'YES' ; then
     $OO_TOOLSDIR/piece/install-l10n-helper $piece $ooo_build_tag "$DESTDIR" files-$piece-*.txt
diff --git a/bin/piece/install-bootstrap b/bin/piece/install-bootstrap
index f1f2ada..b2b3677 100755
--- a/bin/piece/install-bootstrap
+++ b/bin/piece/install-bootstrap
@@ -41,7 +41,6 @@ cp -a \
    $TOOLSDIR/src/*.png \
    $TOOLSDIR/src/*.jpg \
    $TOOLSDIR/src/*.patch \
-   $TOOLSDIR/src/*.odb \
    $TOOLSDIR/src/sg3.* \
    $TOOLSDIR/src/sofficerc-upstream \
    $TOOLSDIR/src/default_images \
diff --git a/bin/piece/post-inst-ure b/bin/piece/post-inst-ure
index edef7fb..017e22c 100755
--- a/bin/piece/post-inst-ure
+++ b/bin/piece/post-inst-ure
@@ -6,8 +6,10 @@ ooo_build_tag=$2
 source $OO_TOOLSDIR/piece/sys-setup
 
 # sigh, basis-link should be in URE because SDK is based just on URE
-ln -sf basis$VERSION $DESTDIR/$OO_INSTDIR/basis-link
-echo "$OO_INSTDIR/basis-link" >>"files-$piece.txt"
+if ! test -L $DESTDIR/$OO_INSTDIR/basis-link ; then
+    ln -sf basis$VERSION $DESTDIR/$OO_INSTDIR/basis-link
+    echo "$OO_INSTDIR/basis-link" >>"files-$piece.txt"
+fi
 
 if test "$OOO_BUILD_NOARCH" = "YES" ; then
     # create the base directories in /usr/share
diff --git a/bin/unpack b/bin/unpack
index 553180d..53e6322 100755
--- a/bin/unpack
+++ b/bin/unpack
@@ -295,7 +295,7 @@ if test "z$OOO_GIT" = "z" ; then
             fi
             # ugly hack around odd positioning of this info
             echo "Unpacking setup_native .txt pieces"
-            ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-ooo320-m17.tar.bz2 | $GNUTAR xf - ) || exit
+            ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-3.2.99.3.tar.bz2 | $GNUTAR xf - ) || exit
             # hack to patch new files in the root dir
             if test "z$PIECE" = "zbootstrap" ; then
                 touch $OOBUILDDIR/boost.m4
diff --git a/download.in b/download.in
index 250bae7..bbddc4c 100755
--- a/download.in
+++ b/download.in
@@ -547,7 +547,7 @@ if ( $download_all || ( '@OOO_LANGS@' ne '' && '@OOO_LANGS@' ne 'en-US' ) || '@B
 }
 
 if ('@PIECE@' eq 'bootstrap') {
-   source_file( 'setup_native_packinfo-ooo320-m17.tar.bz2' );
+   source_file( 'setup_native_packinfo-3.2.99.3.tar.bz2' );
 }
 
 if ('@SYSTEM_LIBWPD@' eq 'NO') {