[ooo-build-commit] .: Branch 'ooo-build-3-2-1' - 2 commits - bin/piece

[Petr Mladek]

 bin/piece/install-devel-helper  |    8 ++++----
 bin/piece/post-inst-postprocess |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 79b8f937160eb0591be151bd7b2b96fc2bf12f0c
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu May 20 16:55:51 2010 +0200

    Sort filelists to get repeatable results
    
    * bin/piece/install-devel-helper: sort filelists; fix by Andreas Jaeger
      <aj at suse dot de>

diff --git a/bin/piece/install-devel-helper b/bin/piece/install-devel-helper
index cfe96f5..d92f804 100755
--- a/bin/piece/install-devel-helper
+++ b/bin/piece/install-devel-helper
@@ -14,10 +14,10 @@ mv $DESTDIR$OO_INSTDIR/solver $DESTDIR$OO_INSTDIR_SHARE
 
 # file list for the devel stuff
 echo "%dir $OO_INSTDIR_SHARE" >files-$piece-devel.txt
-for dir in `find $DESTDIR$OO_INSTDIR_SHARE/solver -type d | sed "s|$DESTDIR||" | grep -v "$OO_INSTDIR_SHARE/solver/noarch"` ; do
+for dir in `find $DESTDIR$OO_INSTDIR_SHARE/solver -type d | sed "s|$DESTDIR||" | grep -v "$OO_INSTDIR_SHARE/solver/noarch"|sort` ; do
     echo "%dir $dir" >>files-$piece-devel.txt
 done
-find $DESTDIR$OO_INSTDIR_SHARE/solver -type f | sed "s|$DESTDIR||" | grep -v "$OO_INSTDIR_SHARE/solver/noarch" >>files-$piece-devel.txt
+find $DESTDIR$OO_INSTDIR_SHARE/solver -type f | sed "s|$DESTDIR||" | grep -v "$OO_INSTDIR_SHARE/solver/noarch"|sort >>files-$piece-devel.txt
 # install the list for link-to-ooo-home script if not empty; top dir is always mentioned
 if test `cat files-$piece-devel.txt | wc -l` -gt 1 ; then
     cp files-$piece-devel.txt $DESTDIR$OO_INSTDIR_SHARE/
@@ -26,10 +26,10 @@ fi
 
 # file list for the prebuilt stuff if any
 rm -f files-$piece-prebuilt.txt
-for dir in `find $DESTDIR$OO_INSTDIR_SHARE/solver -type d | sed "s|$DESTDIR||" | grep "$OO_INSTDIR_SHARE/solver/noarch"` ; do
+for dir in `find $DESTDIR$OO_INSTDIR_SHARE/solver -type d | sed "s|$DESTDIR||" | grep "$OO_INSTDIR_SHARE/solver/noarch"|sort` ; do
     echo "%dir $dir" >>files-$piece-prebuilt.txt
 done
-find $DESTDIR$OO_INSTDIR_SHARE/solver -type f | sed "s|$DESTDIR||" | grep "$OO_INSTDIR_SHARE/solver/noarch" >>files-$piece-prebuilt.txt
+find $DESTDIR$OO_INSTDIR_SHARE/solver -type f | sed "s|$DESTDIR||" | grep "$OO_INSTDIR_SHARE/solver/noarch"|sort >>files-$piece-prebuilt.txt
 # install the list for link-to-ooo-home script if not empty
 if test `cat files-$piece-prebuilt.txt | wc -l` -gt 1 ; then
     cp files-$piece-prebuilt.txt $DESTDIR$OO_INSTDIR_SHARE/
commit e21905bd478e76676a916f8e02c0fcf1274e9ac6
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu May 20 16:50:19 2010 +0200

    Fix repeated postprocess installation
    
    * bin/piece/post-inst-postprocess: force removing of
      $DESTDIR$OO_INSTDIR/program/sofficerc

diff --git a/bin/piece/post-inst-postprocess b/bin/piece/post-inst-postprocess
index aa241b4..b132d29 100755
--- a/bin/piece/post-inst-postprocess
+++ b/bin/piece/post-inst-postprocess
@@ -29,7 +29,7 @@ export JVMFWK_CONFIGFILE=file://`pwd`/jvmfwk3rc
 # FIXME: it would be possible to generate this file by the installer, e.g. in bootstrap
 if test "$DISTRO" = "SUSE" || echo "$DISTRO" | grep -q "SUSE-11" ; then
     if diff -q $DESTDIR$OO_INSTDIR/program/sofficerc $OO_INSTDIR_SHARE/ooo-build/src/sofficerc-upstream ; then
-	rm $DESTDIR$OO_INSTDIR/program/sofficerc
+	rm -f $DESTDIR$OO_INSTDIR/program/sofficerc
 	ln -sf $OO_INSTDIR_SHARE/program/sofficerc $DESTDIR$OO_INSTDIR/program/sofficerc
     else
 	echo "Error: The file \"sofficerc\" has changed in the sources"