diff --git a/0001-java-dir-for-powepc64-and-powepc64le-can-differ.patch b/0001-java-dir-for-powepc64-and-powepc64le-can-differ.patch new file mode 100644 index 0000000..4863441 --- /dev/null +++ b/0001-java-dir-for-powepc64-and-powepc64le-can-differ.patch @@ -0,0 +1,34 @@ +From 7a66dbe982623be620ad6ac426fe689a434e5f51 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Tue, 12 May 2015 10:37:53 +0200 +Subject: [PATCH] java dir for powepc64 and powepc64le can differ + +E.g., RHEL >= 7.1 uses ppc64le for reasons listed in +https://bugs.openjdk.java.net/browse/JDK-8073139 . + +Change-Id: I982e65cdf99999e8a5ed23cf444ccb2aee764c4c +--- + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 26071dc..55157a9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6997,9 +6997,12 @@ then + powerpc) + my_java_arch=ppc + ;; +- powerpc64*) ++ powerpc64) + my_java_arch=ppc64 + ;; ++ powerpc64le) ++ AS_IF([test -d "$JAVA_HOME/jre/lib/ppc64le"], [my_java_arch=ppc64le], [my_java_arch=ppc64]) ++ ;; + x86_64) + my_java_arch=amd64 + ;; +-- +2.4.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 43f0e3b..f6a4a3f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -384,6 +384,7 @@ Patch72: 0001-rhbz-1213173-connectivity-Calc-driver-prevent-docume.patch Patch73: 0001-Resolves-tdf-90757-ensure-start-row-end-row-order-ma.patch Patch74: 0001-Resolves-tdf-91078-check-also-DBData-modified-not-on.patch Patch75: 0001-misspell-some-words-copy-and-paste-slide-to-gimp.patch +Patch76: 0001-java-dir-for-powepc64-and-powepc64le-can-differ.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice