- updated

Changed files:
    openoffice-setup.patch -> 1.4

diff --git a/openoffice-setup.patch b/openoffice-setup.patch
index 94435e372fee3a47874f562551fc22b558080678..eb76113d91805a8a5998b11803bfb7a7b2984ac6 100644 (file)
--- a/openoffice-setup.patch
+++ b/openoffice-setup.patch
@@ -32,3 +32,15 @@ diff -u -u -r1.66 -r1.68
        echo "Using configure options from the environment";
      fi
  fi
+diff -u -u -r1.30 -r1.31
+--- openoffice/bin/package-ooo 6 Jul 2004 13:37:53 -0000       1.30
++++ openoffice/bin/package-ooo 7 Jul 2004 23:24:25 -0000       1.31
+@@ -155,7 +155,7 @@
+ echo "Done";
+ 
+ # install vcl module for more widget sets if needed
+-if test "${OOO_WIDGET_SETS/*,*/comma}" = "comma" ; then
++if (echo "${OOO_WIDGET_SETS}" | grep -q ",") ; then
+     # Must remove the ./instsetoo/$ARCHITECTURE/*/normal/install scripts
+     # as they conflict with the normal system install binary
+     rm -f $OOBUILDDIR/instsetoo/$ARCHITECTURE/*/normal/install