[libreoffice] Resolves rhbz#789622: Adapt SDK to changed paths in LO installation

[sbergmann]

commit 90aa18387a79fd1ae3d7c6418cdffaf0ff52af9e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Feb 14 10:40:02 2012 +0100

    Resolves rhbz#789622: Adapt SDK to changed paths in LO installation

 ...bz-789622-Adapt-SDK-to-changed-paths-in-L.patch |   28 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++++-
 2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-789622-Adapt-SDK-to-changed-paths-in-L.patch b/0001-Resolves-rhbz-789622-Adapt-SDK-to-changed-paths-in-L.patch
new file mode 100644
index 0000000..e631b99
--- /dev/null
+++ b/0001-Resolves-rhbz-789622-Adapt-SDK-to-changed-paths-in-L.patch
@@ -0,0 +1,28 @@
+From bcdadc2e9f3f6a400438cbbefffc60bf02baa0f1 Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Tue, 14 Feb 2012 10:32:59 +0100
+Subject: [PATCH] Resolves rhbz#789622: Adapt SDK to changed paths in LO
+ installation
+
+---
+ odk/settings/std.mk |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/odk/settings/std.mk b/odk/settings/std.mk
+index 0726631..705b528 100644
+--- a/odk/settings/std.mk
++++ b/odk/settings/std.mk
+@@ -27,8 +27,8 @@ SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag
+ URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)"
+ URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb)
+ 
+-OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)offapi.rdb)"
+-OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)
++OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types$(PS)offapi.rdb)"
++OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services$(PS)services.rdb)
+ 
+ OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
+ 
+-- 
+1.7.7.6
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 9dac6aa..2648dd6 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -34,7 +34,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        3.5.0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -125,6 +125,7 @@ Patch15: 0001-Resolves-fdo-43644-survive-registered-but-unavailabl.patch
 Patch16: 0001-make-hsqldb-build-with-java-1.7.patch
 Patch17: libreoffice-ensure-non-broken-xml-tree.patch
 Patch18: 0001-preserve-timestamps-for-.py-files.patch
+Patch19: 0001-Resolves-rhbz-789622-Adapt-SDK-to-changed-paths-in-L.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -835,6 +836,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch16 -p1 -b .make-hsqldb-build-with-java-1.7.patch
 %patch17 -p1 -b .ensure-non-broken-xml-tree.patch
 %patch18 -p1 -b .preserve-timestamps-for-.py-files.patch
+%patch19 -p1 -b .Resolves-rhbz-789622-Adapt-SDK-to-changed-paths-in-L.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english
@@ -2132,6 +2134,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Tue Feb 14 2012 Stephan Bergmann <sbergman at redhat.com> - 3.5.0.3-5
+- Resolves rhbz#789622: Adapt SDK to changed paths in LO installation
+
 * Mon Feb 13 2012 Caolán McNamara <caolanm at redhat.com> - 3.5.0.3-4
 - ensure gdb .py files have the same timstamps so that multilib
   .pyc's and .pyo's have the same content (timestamp in binary cache)