libreoffice/files/libreoffice-3.5-junit.patch

diff --git a/configure.in b/configure.in
index f7ee08f..dab9503 100644
--- a/configure.in
+++ b/configure.in
@@ -9155,7 +9155,7 @@ if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
         # check if either class-path entry is available for hamcrest or
         # it's bundled
         if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |grep -q hamcrest || \
-            "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |grep -q 'Class-Path: hamcrest'; then
+            "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |grep 'Class-Path:' | grep -q 'hamcrest'; then
             AC_MSG_RESULT([$OOO_JUNIT_JAR])
         else
             AC_MSG_ERROR([your junit jar neither sets a classpath nor includes hamcrest; please
1	diff --git a/configure.in b/configure.in
2	index f7ee08f..dab9503 100644
3	--- a/configure.in
4	+++ b/configure.in
5	@@ -9155,7 +9155,7 @@ if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
6	# check if either class-path entry is available for hamcrest or
7	# it's bundled
8	if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" \|grep -q hamcrest \|\| \
9	- "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF \|grep -q 'Class-Path: hamcrest'; then
10	+ "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF \|grep 'Class-Path:' \| grep -q 'hamcrest'; then
11	AC_MSG_RESULT([$OOO_JUNIT_JAR])
12	else
13	AC_MSG_ERROR([your junit jar neither sets a classpath nor includes hamcrest; please