[libreoffice/f16] Related: rhbz#730225 avoid segv in ld

[Caolan McNamara]

commit a7879b6098e968ebbf9155bb430cd5da8307c058
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 12 09:47:12 2011 +0100

    Related: rhbz#730225 avoid segv in ld

 ...z-730225-avoid-segv-in-ld-this-was-set-to.patch |   25 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch b/0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch
new file mode 100644
index 0000000..6abf3f7
--- /dev/null
+++ b/0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch
@@ -0,0 +1,25 @@
+From 761d4c5487570b9c1b37ac4ea13d86fcdb244f65 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Fri, 12 Aug 2011 09:44:45 +0100
+Subject: [PATCH] Related: rhbz#730225 avoid segv in ld, this was set to -O0
+ around 2000
+
+---
+ sd/Library_sdfilt.mk |   12 +-----------
+ 1 files changed, 1 insertions(+), 11 deletions(-)
+
+diff --git a/sd/source/filter/eppt/makefile.mk b/sd/source/filter/eppt/makefile.mk
+index 2a91103..7871436 100644
+--- a/sd/source/filter/eppt/makefile.mk
++++ b/sd/source/filter/eppt/makefile.mk
+@@ -37,10 +37,6 @@ VISIBILITY_HIDDEN=TRUE
+ 
+ # --- Files --------------------------------------------------------
+ 
+-.IF "$(COM)"=="GCC"
+-NOOPTFILES= $(SLO)$/epptso.obj
+-.ENDIF
+-
+ SLOFILES =  $(SLO)$/eppt.obj			\
+             $(SLO)$/epptso.obj			\
+             $(SLO)$/escherex.obj		\
diff --git a/libreoffice.spec b/libreoffice.spec
index 5be9375..b44b9da 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -27,7 +27,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        3.4.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -119,6 +119,7 @@ Patch24: 0001-Resolves-rhbz-715549-use-fontconfig-s-detected-forma.patch
 Patch25: 0001-this-is-definitely-not-present-in-qt-4.8.0-beta1.patch
 Patch26: 0001-Resolves-rhbz-725144-wrong-csh-syntax.patch
 Patch27: 0001-Resolves-rhbz-693265-fix-crash-from-unhandled-except.patch
+Patch28: 0001-Related-rhbz-730225-avoid-segv-in-ld-this-was-set-to.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -748,6 +749,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch25 -p1 -b .this-is-definitely-not-present-in-qt-4.8.0-beta1.patch
 %patch26 -p1 -b .rhbz725144-wrong-csh-syntax.patch
 %patch27 -p1 -b .rhbz693265-fix-crash-from-unhandled-except.patch
+%patch28 -p1 -b .rhbz730225-avoid-segv-in-ld-this-was-set-to.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2032,6 +2034,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
+* Fri Aug 12 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.2.3-3
+- Related: rhbz#730225 avoid segv in ld
+
 * Tue Aug 02 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.2.3-2
 - Resolves: rhbz#693265 fix crash from unhandled exception