[openoffice.org/f14/master] libebook soname bump

[Caolan McNamara]

commit 86bdcf2d5846a42f9fd0a8eba09be71742e26a5c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 7 09:09:52 2010 +0100

    libebook soname bump

 LibO-backport-eapifix.patch |   26 ++++++++++++++++++++++++++
 openoffice.org.spec         |    7 ++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/LibO-backport-eapifix.patch b/LibO-backport-eapifix.patch
new file mode 100644
index 0000000..e314501
--- /dev/null
+++ b/LibO-backport-eapifix.patch
@@ -0,0 +1,26 @@
+commit 81a2e908c915ca379df0ef622174d003f2e2c5dd
+Author: Caolán McNamara <caolanm at redhat.com>
+Date:   Wed Oct 6 15:56:33 2010 +0100
+
+    libebook-1.2.so SONAME bumped again
+
+diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx
+index 7f0c2ae..b9e0382 100644
+--- a/connectivity/source/drivers/evoab2/EApi.cxx
++++ b/connectivity/source/drivers/evoab2/EApi.cxx
+@@ -34,10 +34,11 @@
+ #define  DECLARE_FN_POINTERS 1
+ #include "EApi.h"
+ static const char *eBookLibNames[] = {
+-    "libebook-1.2.so.9", // evolution-2.8
+-    "libebook-1.2.so.5", // evolution-2.4 and 2.6+
+-    "libebook-1.2.so.3", // evolution-2.2
+-    "libebook.so.8"      // evolution-2.0
++    "libebook-1.2.so.10", // bumped again
++    "libebook-1.2.so.9",  // evolution-2.8
++    "libebook-1.2.so.5",  // evolution-2.4 and 2.6+
++    "libebook-1.2.so.3",  // evolution-2.2
++    "libebook.so.8"       // evolution-2.0
+ };
+ 
+ typedef void (*SymbolFunc) (void);
diff --git a/openoffice.org.spec b/openoffice.org.spec
index b812a9f..c91d9b9 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 9
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -121,6 +121,7 @@ Patch42: openoffice.org-3.3.0.ooo114703.vcl.betterlocalize.font.patch
 Patch43: openoffice.org-3.3.0.rh637738.libgcrypt.addmutex.patch
 Patch44: openoffice.org-3.3.0.rh638185.editeng.cjkctlhtmlsizes.patch
 Patch45: openoffice.org-3.2.0.rh632236.writerfilter.cleanup-cell-props.patch
+Patch46: LibO-backport-eapifix.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1654,6 +1655,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch43 -p0 -b .rh637738.libgcrypt.addmutex.patch
 %patch44 -p1 -b .rh638185.editeng.cjkctlhtmlsizes.patch
 %patch45 -p1 -b .rh632236.writerfilter.cleanup-cell-props.patch
+%patch46 -p1 -b .LibO-backport-eapifix.patch
 rm -rf l10n/source/kid  # rhbz#639212
 
 %build
@@ -3853,6 +3855,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Fri Oct 01 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-9.4
+- libebook soname bump
+
 * Fri Oct 01 2010 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-9.3
 - Resolves: rhbz#639212 /usr/share/mime/packages/openoffice.org.xml
   seems to be malformed (dtardon)