- DON'T hardcode java paths!

[packages/libreoffice.git] / openoffice-files.patch

diff --git a/openoffice-files.patch b/openoffice-files.patch
index e54f930407de7fb7153fcb0ea90b53d5e7e13c6d..050527223f4929d1616962d5e754c96a39bf51fd 100644 (file)
--- a/openoffice-files.patch
+++ b/openoffice-files.patch
@@ -1,21 +1,19 @@
---- ooo-build-1.3.0/bin/install-help.orig      2004-07-24 16:09:52.000000000 +0200
-+++ ooo-build-1.3.0/bin/install-help   2004-07-24 16:26:11.000000000 +0200
-@@ -41,11 +41,7 @@
-       fi
+--- ooo-build-1.3.0/bin/install-help.orig      2004-07-27 12:57:46.000000000 +0200
++++ ooo-build-1.3.0/bin/install-help   2004-07-29 12:10:57.000000000 +0200
+@@ -44,9 +44,7 @@
      done
-       
--    # create list of common files and directories
--    echo "%dir $OOINSTDIR/" >$BUILDDIR/help_${LANGCODE}_list.txt || exit 1;
--    echo "%dir $HELPDIR/" >>$BUILDDIR/help_${LANGCODE}_list.txt || exit 1;
--    find $HELPDIR/$LANGCODE -type d -exec echo %dir {}/ \; >>$BUILDDIR/help_${LANGCODE}_list.txt || exit 1;
--    find $HELPDIR/$LANGCODE "(" -type f -or -type l ")" >>$BUILDDIR/help_${LANGCODE}_list.txt || exit 1;
+ 
+     # fix permissions and create list of files and directories
+-    echo "%defattr(644,root,root,755)" >$BUILDDIR/help_${LANGCODE}_list.txt || exit 1;
+-    find $HELPDIR/$LANGCODE -type d -exec chmod 755 {} \; -exec echo %dir {}/ \; >>$BUILDDIR/help_${LANGCODE}_list.txt || exit 1;
+-    find $HELPDIR/$LANGCODE -type f -exec chmod 644 {} \; -print >>$BUILDDIR/help_${LANGCODE}_list.txt || exit 1;
 +    echo "$HELPDIR/$LANGCODE" >$BUILDDIR/help_${LANGCODE}_list.txt || exit 1;
    else
      echo "Warning: $LANGCODE help content is not available..."
      rm -f $BUILDDIR/help_${LANGCODE}_list.txt
---- ooo-build-1.3.0/bin/package-ooo.orig       2004-07-24 16:56:54.000000000 +0200
-+++ ooo-build-1.3.0/bin/package-ooo    2004-07-26 22:12:45.000000000 +0200
-@@ -251,9 +251,7 @@
+--- ooo-build-1.3.0/bin/package-ooo.orig       2004-07-25 15:43:19.000000000 +0200
++++ ooo-build-1.3.0/bin/package-ooo    2004-07-29 12:11:59.000000000 +0200
+@@ -284,9 +284,7 @@
  mv common_list.txt.new common_list.txt
  
  # move English help to an extra list