From 55a3afca488420259dba330bdbd9815b805fb817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 1 Jul 2015 10:32:20 +0100 Subject: [PATCH] try ppc64le jdk location work-around --- ...ppc64le-has-both-these-dirs-but-jawt.patch | 27 +++++++++++++++++++ libreoffice.spec | 1 + 2 files changed, 28 insertions(+) create mode 100644 0001-f22-openjdk-for-ppc64le-has-both-these-dirs-but-jawt.patch diff --git a/0001-f22-openjdk-for-ppc64le-has-both-these-dirs-but-jawt.patch b/0001-f22-openjdk-for-ppc64le-has-both-these-dirs-but-jawt.patch new file mode 100644 index 0000000..d5fd604 --- /dev/null +++ b/0001-f22-openjdk-for-ppc64le-has-both-these-dirs-but-jawt.patch @@ -0,0 +1,27 @@ +From e13b0657a3a05139f751124145aa10758c59d1dd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Wed, 1 Jul 2015 08:34:58 +0100 +Subject: [PATCH] f22 openjdk for ppc64le has both these dirs, but jawt is only + on one + +Change-Id: Ie770ecceb8c8f5a6fa882a9f5d5a26806b029589 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index aecbe8f..8964c96 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -7058,7 +7058,7 @@ then + my_java_arch=ppc64 + ;; + powerpc64le) +- AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64]) ++ AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le/libjawt.so"], [my_java_arch=ppc64le], [my_java_arch=ppc64]) + JAVA_ARCH=$my_java_arch + ;; + x86_64) +-- +2.4.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 3c9b18d..f8a693c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -330,6 +330,7 @@ Patch18: 0001-Resolves-tdf-49407-enable-CaseMap-property-in-impres.patch Patch19: 0001-rhbz-1233420-handle-inexistent-cond.-format.patch Patch20: 0001-allow-slide-design-to-affect-multiple-standard-pages.patch Patch21: 0001-implement-equalize-width-and-height-for-impress-draw.patch +Patch22: 0001-f22-openjdk-for-ppc64le-has-both-these-dirs-but-jawt.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice