- killed in bashizm.patch

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

diff --git a/openoffice-setup.patch b/openoffice-setup.patch
index cc2cb3ef974945c040a4d6880313b2600c32cc44..dce1e17727fabf874bfcf396790abd6625244f63 100644 (file)
--- a/openoffice-setup.patch
+++ b/openoffice-setup.patch
@@ -32,18 +32,6 @@ 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
 --- openoffice/dev/null        1970-01-01 01:00:00.000000000 +0100
 +++ openoffice/bin/install-dictionaries        2004-07-06 02:28:20.471312936 +0200
 @@ -0,0 +1,88 @@