[libreoffice] Patch to actually provide libemboleobj.so for packaging was missing

[sbergmann]

commit 110831e337ea3b612b2eacae809e6b947b51f22b
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun Feb 17 22:32:50 2013 +0100

    Patch to actually provide libemboleobj.so for packaging was missing
    
    ...from 23c1c9f18d00769906f3f7fb7a1795690d5e9e18 "Resolves: fdo#60491 missing libemboleobj.so."

 ...cp2-always-package-emboleobj-library-on-n.patch |   59 ++++++++++++++++++++
 libreoffice.spec                                   |    2 +
 2 files changed, 61 insertions(+), 0 deletions(-)
---
diff --git a/0001-fdo-60491-scp2-always-package-emboleobj-library-on-n.patch b/0001-fdo-60491-scp2-always-package-emboleobj-library-on-n.patch
new file mode 100644
index 0000000..68cf871
--- /dev/null
+++ b/0001-fdo-60491-scp2-always-package-emboleobj-library-on-n.patch
@@ -0,0 +1,59 @@
+From 92e7811ee757db41dc0b428aa1fe1f3ba3797bac Mon Sep 17 00:00:00 2001
+From: Michael Stahl <mstahl at redhat.com>
+Date: Sat, 9 Feb 2013 22:39:42 +0100
+Subject: [PATCH] fdo#60491: scp2: always package emboleobj library on non-WNT
+ platforms
+
+(regression from 09cd5c460704ddd99669a61ae335bfb2ce357140, which defined
+ DISABLE_ATL on all platforms in configure)
+
+(cherry picked from commit ca8ac449e3524f895de1e94a3c5d511591031b40)
+
+Conflicts:
+	postprocess/Rdb_services.mk
+
+Change-Id: If2373386102373cb49e8cd0c6bf807da2f805dda
+Reviewed-on: https://gerrit.libreoffice.org/2095
+Reviewed-by: Tor Lillqvist <tml at iki.fi>
+Tested-by: Tor Lillqvist <tml at iki.fi>
+---
+ postprocess/packcomponents/makefile.mk | 4 ++--
+ scp2/source/ooo/file_library_ooo.scp   | 3 ++-
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
+index fa3231c..a37ba73 100644
+--- a/postprocess/packcomponents/makefile.mk
++++ b/postprocess/packcomponents/makefile.mk
+@@ -224,12 +224,12 @@ my_components += \
+ 
+ .ENDIF
+ 
+-.IF "$(DISABLE_ATL)" == ""
+ .IF "$(OS)" == "WNT"
++.IF "$(DISABLE_ATL)" == ""
+ my_components += component/embeddedobj/source/msole/emboleobj.windows
++.ENDIF
+ .ELSE
+ my_components += component/embeddedobj/source/msole/emboleobj
+-.ENDIF
+ .END
+ 
+ .IF "$(DISABLE_NEON)" != "TRUE"
+diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
+index 642cd81..6dd5e29 100644
+--- a/scp2/source/ooo/file_library_ooo.scp
++++ b/scp2/source/ooo/file_library_ooo.scp
+@@ -394,7 +394,8 @@ STD_LIB_FILE(gid_File_Lib_Drawinglayer,drawinglayer)
+ 
+ SPECIAL_LIB_FILE(gid_File_Lib_Embobj,embobj)
+ 
+-#ifndef DISABLE_ATL
++/* fdo#60491 always need emboleobj library on non-WNT platforms */
++#if !defined(WNT) || !defined(DISABLE_ATL)
+ SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj)
+ #endif
+ 
+-- 
+1.8.1.2
+
diff --git a/libreoffice.spec b/libreoffice.spec
index f3eaa15..9f1f2ab 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -255,6 +255,7 @@ Patch21: 0001-no-g_list_free_full-in-RHEL-6-glib.patch
 Patch22: 0001-Resolves-rhbz-910176-cannot-select-directory-with-gn.patch
 Patch23: 0001-Work-around-problem-with-boost-shared_array-NULL-cto.patch
 Patch24: 0001-fix-compile-for-change-to-boost-1.53.0-declaring-sma.patch
+Patch25: 0001-fdo-60491-scp2-always-package-emboleobj-library-on-n.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -999,6 +1000,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch22 -p1 -b .rhbz-910176-cannot-select-directory-with-gn.patch
 %patch23 -p1 -b .Work-around-problem-with-boost-shared_array-NULL-cto.patch
 %patch24 -p1 -b .fix-compile-for-change-to-boost-1.53.0-declaring-sma.patch
+%patch25 -p1 -b .fdo-60491-scp2-always-package-emboleobj-library-on-n.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english