From af102ccccc1b86bf4bbae8d0d8cce06858f73b90b1a49293d69b6976d8b2fecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 9 Apr 2015 12:42:47 +0000 Subject: [PATCH] - Remove patch to look for help in /usr/share, we symlink it back to lib, so there is no actual need to search for it directly, migth fix bnc#915996: * officecfg-help-in-usr-share.diff OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=242 --- libreoffice.changes | 8 ++++++++ libreoffice.spec | 4 ---- officecfg-help-in-usr-share.diff | 35 -------------------------------- 3 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 officecfg-help-in-usr-share.diff diff --git a/libreoffice.changes b/libreoffice.changes index 2ad5d22..2a1d1a1 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 9 12:42:00 UTC 2015 - tchvatal@suse.com + +- Remove patch to look for help in /usr/share, we symlink it back to + lib, so there is no actual need to search for it directly, migth + fix bnc#915996: + * officecfg-help-in-usr-share.diff + ------------------------------------------------------------------- Wed Apr 8 13:06:41 UTC 2015 - andras.timar@collabora.com diff --git a/libreoffice.spec b/libreoffice.spec index 996c0e9..6170b6c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -60,9 +60,6 @@ Source2003: %{external_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip Source2004: %{external_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip # Needed for wiki-published and always taken as bundled Source2005: %{external_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -# search help icons in %{_prefix}/share -# FIXME: make it configurable in integrate into git -Patch0: officecfg-help-in-usr-share.diff # change user config dir name from ~/.libreoffice/3 to ~/.libreoffice/3-suse # to avoid BerkleyDB incompatibility with the plain build # FIXME: make it configurable and push upstream @@ -838,7 +835,6 @@ Provides additional %{langname} translations and resources for %{project}. \ %prep %setup -q -b1 -b2 -%patch0 -p1 %patch1 %patch2 -p1 %patch3 -p1 diff --git a/officecfg-help-in-usr-share.diff b/officecfg-help-in-usr-share.diff deleted file mode 100644 index 05d4006..0000000 --- a/officecfg-help-in-usr-share.diff +++ /dev/null @@ -1,35 +0,0 @@ -Index: libreoffice-4.4.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu -=================================================================== ---- libreoffice-4.4.0.1.orig/officecfg/registry/data/org/openoffice/Office/Paths.xcu -+++ libreoffice-4.4.0.1/officecfg/registry/data/org/openoffice/Office/Paths.xcu -@@ -98,7 +98,7 @@ - - - -- -+ - - - -Index: libreoffice-4.4.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs -=================================================================== ---- libreoffice-4.4.0.1.orig/officecfg/registry/schema/org/openoffice/Office/Common.xcs -+++ libreoffice-4.4.0.1/officecfg/registry/schema/org/openoffice/Office/Common.xcs -@@ -1615,7 +1615,7 @@ - - Specifies the path to the Office help files. - -- $(instpath)/@LIBO_SHARE_HELP_FOLDER@ -+ /usr/share/help - - - -@@ -1810,7 +1810,7 @@ - Specifies the default directory where Office help files are - located. - -- $(instpath)/@LIBO_SHARE_HELP_FOLDER@ -+ /usr/share/help - - -