[libreoffice] Related: rhbz#1185307 get search for Hamcrest unstuck

[sbergmann]

commit 42f507549a81082702c02c547b79329a806d612f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 23 16:05:03 2015 +0100

    Related: rhbz#1185307 get search for Hamcrest unstuck

 ...z-1185307-One-more-location-to-look-for-H.patch |   27 ++++++++++++++++++++
 libreoffice.spec                                   |    6 +++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0001-Related-rhbz-1185307-One-more-location-to-look-for-H.patch b/0001-Related-rhbz-1185307-One-more-location-to-look-for-H.patch
new file mode 100644
index 0000000..5e676aa
--- /dev/null
+++ b/0001-Related-rhbz-1185307-One-more-location-to-look-for-H.patch
@@ -0,0 +1,27 @@
+From b471dca2a924a3f03fe2a0a7fe2612f9c6c6bd54 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Fri, 23 Jan 2015 15:55:24 +0100
+Subject: [PATCH] Related rhbz#1185307: One more location to look for Hamcrest
+ jar
+
+Change-Id: I307a009c14dd5cd946b39fbfb80ffc3962a7739b
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 5c67205..607e97e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -12022,6 +12022,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"; then
+         if test "$with_hamcrest" = "yes"; then
+             if test -e /usr/share/lib/java/hamcrest.jar; then
+                 HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar
++            elif test -e /usr/share/java/hamcrest/core.jar; then
++                HAMCREST_JAR=/usr/share/java/hamcrest/core.jar
+             else
+                 HAMCREST_JAR=/usr/share/java/hamcrest.jar
+             fi
+-- 
+1.9.3
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 341b897..9d6b36e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -46,7 +46,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.3
-Release:        1%{?libo_prerelease}%{?dist}
+Release:        2%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0 and CC0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/
@@ -328,6 +328,7 @@ Patch20: 0001-Use-the-same-advanced-Ellipse-and-Rectangle-shapes-i.patch
 Patch21: 0001-if-we-change-the-keys-we-have-to-resort-based-on-the.patch
 Patch22: 0001-rhbz-1175027-sw-fix-life-cycle-of-SwConnectionDispos.patch
 Patch23: 0001-rhbz-1184582-At-least-catch-and-log-UNO-exceptions-i.patch
+Patch24: 0001-Related-rhbz-1185307-One-more-location-to-look-for-H.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2351,6 +2352,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Fri Jan 23 2015 Stephan Bergmann <sbergman at redhat.com> - 1:4.4.0.3-2
+- Related: rhbz#1185307 get search for Hamcrest unstuck
+
 * Fri Jan 23 2015 David Tardon <dtardon at redhat.com> - 1:4.4.0.3-1
 - update to 4.4.0 rc3