- updated hamcrest/junit patch

diff --git a/libreoffice-hamcrest.patch b/libreoffice-hamcrest.patch
index 2e8d3fee6d85058e3ce644d3ea8d4894641f8a43..8c1c6835d6600104e34ca614e9f14e72bf64a38f 100644 (file)
--- a/libreoffice-hamcrest.patch
+++ b/libreoffice-hamcrest.patch
@@ -1,15 +1,13 @@
---- configure.ac.orig  2012-02-01 13:56:49.000000000 +0100
-+++ configure.ac       2012-02-23 18:57:32.000000000 +0100
-@@ -7561,6 +7561,11 @@
-                     [AC_MSG_ERROR(commons-logging.jar not found.)], [])
-             fi
-         fi
-+        # hamcrest is a dependency of junit, add it to the classpath if
-+        # found
-+        if test -e /usr/share/java/hamcrest-core.jar; then
-+            OOO_JUNIT_JAR=$OOO_JUNIT_JAR:/usr/share/java/hamcrest-core.jar
-+        fi
-     else
-         AC_MSG_RESULT([internal])
-         SYSTEM_APACHE_COMMONS=NO
-
+--- ../BUILD/libreoffice-4.3.2.2/configure.ac.orig     2014-10-12 14:42:16.760723674 +0200
++++ ../BUILD/libreoffice-4.3.2.2/configure.ac  2014-10-12 14:59:04.195877183 +0200
+@@ -12315,6 +12315,10 @@
+     if test "$_os" = "WINNT"; then
+         OOO_JUNIT_JAR=`cygpath -m "$OOO_JUNIT_JAR"`
+     fi
++    # hamcrest is a dependency of junit, add it to the classpath if found
++    if test -e /usr/share/java/hamcrest-core.jar; then
++        OOO_JUNIT_JAR=$OOO_JUNIT_JAR:/usr/share/java/hamcrest-core.jar
++    fi
+     printf 'import org.junit.Before; import org.hamcrest.BaseDescription;' \
+         > conftest.java
+     if "$JAVACOMPILER" -classpath "$OOO_JUNIT_JAR" conftest.java >&5 2>&5; then