libreoffice-hamcrest.patch

   1 --- configure.in.orig   2012-02-01 13:56:49.000000000 +0100
   2 +++ configure.in        2012-02-23 18:57:32.000000000 +0100
   3 @@ -7561,6 +7561,11 @@
   4                      [AC_MSG_ERROR(commons-logging.jar not found.)], [])
   5              fi
   6          fi
   7 +        # hamcrest is a dependency of junit, add it to the classpath if
   8 +        # found
   9 +        if test -e /usr/share/java/hamcrest-core.jar; then
  10 +            OOO_JUNIT_JAR=$OOO_JUNIT_JAR:/usr/share/java/hamcrest-core.jar
  11 +        fi
  12      else
  13          AC_MSG_RESULT([internal])
  14          SYSTEM_APACHE_COMMONS=NO
  15 @@ -9159,7 +9159,7 @@
  16      if test $? -eq 0; then
  17          # check if either class-path entry is available for hamcrest or
  18          # it's bundled
  19 -        if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |$GREP -q hamcrest || \
  20 +        if "$JAVA_HOME/bin/jar" tf /usr/share/java/hamcrest-core.jar |$GREP -q hamcrest || \
  21              "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |$GREP 'Class-Path:' | $GREP -q 'hamcrest'; then
  22              AC_MSG_RESULT([$OOO_JUNIT_JAR])
  23          else
  24