[libreoffice/f16] Resolves: rhbz#826609, rhbz#820554 fix smoketest on ppc[64], s390[x]

[Caolán McNamara]

commit 88ea23770f3034e38f7d3f0760571b3641f8185b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 8 09:50:24 2012 +0100

    Resolves: rhbz#826609, rhbz#820554 fix smoketest on ppc[64], s390[x]

 ...bz-826609-rhbz-820554-fix-smoketest-on-pp.patch |   49 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++-
 2 files changed, 55 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch b/0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch
new file mode 100644
index 0000000..29472dd
--- /dev/null
+++ b/0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch
@@ -0,0 +1,49 @@
+diff -ru libreoffice-3.4.5.2/solenv/gbuild/platform/linux-POWERPC64.mk libreoffice-3.4.5.2/solenv/gbuild/platform/linux-POWERPC64.mk
+--- libreoffice-3.4.5.2/solenv/gbuild/platform/linux-POWERPC64.mk	2012-06-08 09:43:20.530668539 +0100
++++ libreoffice-3.4.5.2/solenv/gbuild/platform/linux-POWERPC64.mk	2012-06-08 09:44:39.776520838 +0100
+@@ -30,7 +30,6 @@
+ #please make generic modifications to unxgcc.mk or linux.mk
+ gb_CPUDEFS := -D$(CPUNAME)
+ gb_CXXFLAGS += -mminimal-toc
+-gb_CFLAGS += -fsigned-char
+ 
+ include $(GBUILDDIR)/platform/linux-POWERPC.mk
+ 
+diff -ru libreoffice-3.4.5.2/solenv/gbuild/platform/linux-POWERPC.mk libreoffice-3.4.5.2/solenv/gbuild/platform/linux-POWERPC.mk
+--- libreoffice-3.4.5.2/solenv/gbuild/platform/linux-POWERPC.mk	2012-06-08 09:43:20.530668539 +0100
++++ libreoffice-3.4.5.2/solenv/gbuild/platform/linux-POWERPC.mk	2012-06-08 09:44:43.268558424 +0100
+@@ -31,8 +31,6 @@
+ gb_CPUDEFS += -DPOWERPC -DPPC
+ gb_Library_DLLPOSTFIX := lp
+ gb_COMPILERDEFAULTOPTFLAGS := -O2
+-gb_CXXFLAGS += -fsigned-char
+-gb_CFLAGS += -fsigned-char
+ 
+ include $(GBUILDDIR)/platform/unxgcc.mk
+ 
+diff -ru libreoffice-3.4.5.2/solenv/gbuild/platform/linux-S390.mk libreoffice-3.4.5.2/solenv/gbuild/platform/linux-S390.mk
+--- libreoffice-3.4.5.2/solenv/gbuild/platform/linux-S390.mk	2012-06-08 09:43:20.530668539 +0100
++++ libreoffice-3.4.5.2/solenv/gbuild/platform/linux-S390.mk	2012-06-08 09:44:33.246450558 +0100
+@@ -31,8 +31,8 @@
+ gb_CPUDEFS += -DS390
+ gb_Library_DLLPOSTFIX := l3
+ gb_COMPILERDEFAULTOPTFLAGS := -O2
+-gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
+-gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
++gb_CXXFLAGS += -fno-omit-frame-pointer
++gb_CFLAGS += -fno-omit-frame-pointer
+ 
+ include $(GBUILDDIR)/platform/linux.mk
+ 
+diff -ru libreoffice-3.4.5.2/solenv/inc/unxlngs390.mk libreoffice-3.4.5.2/solenv/inc/unxlngs390.mk
+--- libreoffice-3.4.5.2/solenv/inc/unxlngs390.mk	2012-06-08 09:43:20.741670807 +0100
++++ libreoffice-3.4.5.2/solenv/inc/unxlngs390.mk	2012-06-08 09:44:52.421656955 +0100
+@@ -30,7 +30,5 @@
+ PICSWITCH:=-fPIC
+ .INCLUDE : unxlng.mk
+ CDEFS+=-DS390
+-CFLAGS+=-fsigned-char -fno-omit-frame-pointer
+-CFLAGSCC+=-fsigned-char
+-CFLAGSCXX+=-fsigned-char
++CFLAGS+=-fno-omit-frame-pointer
+ DLLPOSTFIX=l3
diff --git a/libreoffice.spec b/libreoffice.spec
index 46af2e4..ff772a4 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -33,7 +33,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        16%{?dist}
+Release:        17%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain and ASL 2.0 and Artistic
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -254,6 +254,7 @@ Patch132: 0001-resolved-rhbz-819118-catch-exception-from-VBA-lib-co.patch
 Patch133: CVE-2012-1149.patch
 Patch134: 0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch
 Patch135: CVE-2012-2334.patch
+Patch136: 0001-Resolves-rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1195,6 +1196,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch133 -p1 -b .CVE-2012-1149
 %patch134 -p1 -b .0001-ppc-yyinput-returns-a-int-truncating-to-unsigned-cha.patch
 %patch135 -p1 -b .CVE-2012-2334
+%patch136 -p1 -b .rhbz-826609-rhbz-820554-fix-smoketest-on-pp.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2514,6 +2516,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Fri Jun 08 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-17
+- Resolves: rhbz#826609, rhbz#820554 fix smoketest on ppc[64], s390[x]
+
 * Thu May 24 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-16
 - Resolves: CVE-2012-2334