/[packages]/cauldron/libreoffice/pristine/SOURCES/0001-Related-rhbz-1185307-One-more-location-to-look-for-H.patch
ViewVC logotype

Contents of /cauldron/libreoffice/pristine/SOURCES/0001-Related-rhbz-1185307-One-more-location-to-look-for-H.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 812201 - (show annotations) (download)
Sun Jan 25 19:29:15 2015 UTC (9 years, 2 months ago) by tv
Original Path: cauldron/libreoffice/current/SOURCES/0001-Related-rhbz-1185307-One-more-location-to-look-for-H.patch
File size: 951 byte(s)
- sync with FC now they updated to 4.4.0 rc3 too plus:
  o move officehelper.py to pyuno package so it can be imported from python
  o add Provides: libreoffice-headless; packages are depending on it
 
1 From b471dca2a924a3f03fe2a0a7fe2612f9c6c6bd54 Mon Sep 17 00:00:00 2001
2 From: Stephan Bergmann <sbergman@redhat.com>
3 Date: Fri, 23 Jan 2015 15:55:24 +0100
4 Subject: [PATCH] Related rhbz#1185307: One more location to look for Hamcrest
5 jar
6
7 Change-Id: I307a009c14dd5cd946b39fbfb80ffc3962a7739b
8 ---
9 configure.ac | 2 ++
10 1 file changed, 2 insertions(+)
11
12 diff --git a/configure.ac b/configure.ac
13 index 5c67205..607e97e 100644
14 --- a/configure.ac
15 +++ b/configure.ac
16 @@ -12022,6 +12022,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no"; then
17 if test "$with_hamcrest" = "yes"; then
18 if test -e /usr/share/lib/java/hamcrest.jar; then
19 HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar
20 + elif test -e /usr/share/java/hamcrest/core.jar; then
21 + HAMCREST_JAR=/usr/share/java/hamcrest/core.jar
22 else
23 HAMCREST_JAR=/usr/share/java/hamcrest.jar
24 fi
25 --
26 1.9.3
27

  ViewVC Help
Powered by ViewVC 1.1.30