diff --git a/0001-configure-fix-S390X-CPUNAME.patch b/0001-configure-fix-S390X-CPUNAME.patch new file mode 100644 index 0000000..8c50e94 --- /dev/null +++ b/0001-configure-fix-S390X-CPUNAME.patch @@ -0,0 +1,29 @@ +From 8c482683edf6aee17d4718150158293461b88b3b Mon Sep 17 00:00:00 2001 +From: Michael Stahl +Date: Mon, 20 Aug 2012 12:41:08 +0200 +Subject: [PATCH] configure: fix S390X CPUNAME: + +The value was changed to S390x, presumably by accident, breaking the +build (regression from 480b32d3809830002ecc28508d40af3ecd4ad272). + +Change-Id: Icca90818c6363855437a273714a8317becdfd0e5 +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index c47a5fe..6f8d115 100644 +--- a/configure.in ++++ b/configure.in +@@ -3459,7 +3459,7 @@ linux-gnu*) + ;; + s390x) + CPU=3 +- CPUNAME=S390x ++ CPUNAME=S390X + RTL_ARCH=S390x + LIB64="lib64" + OUTPATH=unxlngs390x +-- +1.7.11.2 + diff --git a/libreoffice.spec b/libreoffice.spec index cdbdf03..9d6538e 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -169,6 +169,7 @@ Patch8: 0001-Resolves-rhbz-838368-view-ignored-while-view-accepte.patch Patch9: 0001-disable-failing-check.patch Patch10: 0001-Resolves-rhbz-836937-insanely-slow-with-Zemberek-ins.patch Patch11: 0001-Resolves-rhbz-846775-Clipboard-must-be-disposed-befo.patch +Patch12: 0001-configure-fix-S390X-CPUNAME.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -777,6 +778,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch9 -p1 -b .disable-failing-check.patch %patch10 -p1 -b .rhbz-836937-insanely-slow-with-Zemberek-ins.patch %patch11 -p1 -b .rhbz-846775-Clipboard-must-be-disposed-befo.patch +%patch12 -p1 -b .0001-configure-fix-S390X-CPUNAME.patch # TODO: check this # these are horribly incomplete--empty translations and copied english