From 421eee12c2b470c0beda2024d7c16d17c5969e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 25 Apr 2019 08:41:51 +0100 Subject: [PATCH] Resolves: rhbz#1702810 Prepare for upcoming libebook --- ...02810-Prepare-for-upcoming-libebook-.patch | 32 +++++++++++++++++++ libreoffice.spec | 6 +++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-Resolves-rhbz-1702810-Prepare-for-upcoming-libebook-.patch diff --git a/0001-Resolves-rhbz-1702810-Prepare-for-upcoming-libebook-.patch b/0001-Resolves-rhbz-1702810-Prepare-for-upcoming-libebook-.patch new file mode 100644 index 0000000..9dc9ce5 --- /dev/null +++ b/0001-Resolves-rhbz-1702810-Prepare-for-upcoming-libebook-.patch @@ -0,0 +1,32 @@ +From 222274828b6da2e90de857c0c40c343b9bdd5b2c Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Thu, 25 Apr 2019 08:38:52 +0100 +Subject: [PATCH] Resolves: rhbz#1702810 Prepare for upcoming libebook soname + version bump + +as noted here: +https://mail.gnome.org/archives/desktop-devel-list/2019-April/msg00016.html + +wrt: +https://gitlab.gnome.org/GNOME/evolution-data-server/issues/33 + +Change-Id: I88f900b3adf12de545b1d2d16da67eae22fde748 +--- + connectivity/source/drivers/evoab2/EApi.cxx | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx +index 41bc62c9ab20..c802778cff2e 100644 +--- a/connectivity/source/drivers/evoab2/EApi.cxx ++++ b/connectivity/source/drivers/evoab2/EApi.cxx +@@ -21,6 +21,7 @@ + #define DECLARE_FN_POINTERS 1 + #include "EApi.h" + static const char *eBookLibNames[] = { ++ "libebook-1.2.so.20", // evolution-data-server 3.33.2+ + "libebook-1.2.so.19", // evolution-data-server 3.24+ + "libebook-1.2.so.16", + "libebook-1.2.so.15", +-- +2.20.1 + diff --git a/libreoffice.spec b/libreoffice.spec index bb27b2f..cd598aa 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 4%{?libo_prerelease}%{?dist} +Release: 5%{?libo_prerelease}%{?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 MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -245,6 +245,7 @@ Patch5: 0001-rhbz-1690645-null-deref-of-pEntry-when-GetCurEntry-r.patch Patch6: 0001-rhbz-1690732-basic-font-variation-support.patch Patch7: 0001-rhbz-1699347-__glibcxx_requires_subscript-enabled-in.patch Patch8: 0001-no-home-as-templates.patch +Patch9: 0001-Resolves-rhbz-1702810-Prepare-for-upcoming-libebook-.patch %if 0%{?rhel} # not upstreamed @@ -2125,6 +2126,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Thu Apr 25 2019 Caolán McNamara - 1:6.2.2.2-5 +- Resolves: rhbz#1702810 Prepare for upcoming libebook + * Sat Apr 13 2019 Caolán McNamara - 1:6.2.2.2-4 - tdf#119890 followup Forbid HOME to be the default dir for templates