From 3fd46b28ae69b4cc2e7fef1aa11a57153861cbcaf579c92d92f5c457cb0ba5d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 13 May 2015 11:32:26 +0000
Subject: [PATCH 1/3] - One more fix for help handling bnc#915996

OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=275
---
 libreoffice.changes | 5 +++++
 libreoffice.spec    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libreoffice.changes b/libreoffice.changes
index 22ccd41..470096b 100644
--- a/libreoffice.changes
+++ b/libreoffice.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 13 11:31:52 UTC 2015 - tchvatal@suse.com
+
+- One more fix for help handling bnc#915996
+
 -------------------------------------------------------------------
 Sun May 10 10:01:38 UTC 2015 - tchvatal@suse.com
 
diff --git a/libreoffice.spec b/libreoffice.spec
index 11b7e57..5a22f9b 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1229,9 +1229,9 @@ grep -v '%{_libdir}/%{name}/help' file-lists/common_list.txt > tmplist
 mv tmplist file-lists/common_list.txt
 echo "%dir %{_datadir}/%{name}/help" >>file-lists/common_list.txt
 mv %{buildroot}/%{_libdir}/%{name}/help/ %{buildroot}/%{_datadir}/%{name}/
-echo "%ghost %{_libdir}/%{name}/help" >> file-lists/common_list.txt
 for file in idxcaption.xsl idxcontent.xsl main_transform.xsl ; do
-    echo "%{_datadir}/%{name}/help/$file" >> file-lists/common_list.txt
+    mv "%{buildroot}/%{_datadir}/%{name}/help/$file" "%{buildroot}/%{_libdir}/%{name}/help/$file"
+    echo "%{_libdir}/%{name}/help/$file" >> file-lists/common_list.txt
 done
 # autotext is another self contained dir
 mkdir -p %{buildroot}/%{_datadir}/%{name}/share/autotext/

From 740f8c1a03095827b681844236c55b1b7ad2212b1ce825a512047ccac8f88ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 14 May 2015 09:14:44 +0000
Subject: [PATCH 2/3] OBS-URL:
 https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=276

---
 libreoffice.spec | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/libreoffice.spec b/libreoffice.spec
index 5a22f9b..b90862c 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1229,6 +1229,7 @@ grep -v '%{_libdir}/%{name}/help' file-lists/common_list.txt > tmplist
 mv tmplist file-lists/common_list.txt
 echo "%dir %{_datadir}/%{name}/help" >>file-lists/common_list.txt
 mv %{buildroot}/%{_libdir}/%{name}/help/ %{buildroot}/%{_datadir}/%{name}/
+mkdir -p %{buildroot}/%{_libdir}/%{name}/help/
 for file in idxcaption.xsl idxcontent.xsl main_transform.xsl ; do
     mv "%{buildroot}/%{_datadir}/%{name}/help/$file" "%{buildroot}/%{_libdir}/%{name}/help/$file"
     echo "%{_libdir}/%{name}/help/$file" >> file-lists/common_list.txt
@@ -1320,26 +1321,6 @@ chrpath --delete %{buildroot}%{_libdir}/%{name}/program/librasqal-lo.so.3
 # We have ton of duped files so run over it
 %fdupes %{buildroot}%{_prefix}
 
-%pre
-# do not crate cache for bundled extensions because it is not secure
-# rather remove it (fdo#53006, fdo#51252, bnc#769448)
-# Remove after 12.2 is out of support/migration scope.
-bundled_cache="%{_libdir}/%{name}/share/prereg/bundled"
-if [ -d "$bundled_cache" ]; then
-    rm -rf "$bundled_cache"/* || true
-fi
-# Directory to symlink is not working in RPM so workaround it
-# FIXME: Remove after 13.1 is out of update scope.
-helpdir="%{_libdir}/%{name}/help"
-autotextdir="%{_libdir}/%{name}/share/autotext"
-if [ -d "$helpdir" ]; then
-    rm -rf "$helpdir" || true
-fi
-if [ -d "$autotextdir" ]; then
-    rm -rf "$autotextdir" || true
-fi
-exit 0
-
 %post
 /sbin/ldconfig
 %mime_database_post

From ac3b5e735254579553e66c5e9818fe6e8d8f4e082023ddc9a8f6e57171d8cac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 14 May 2015 19:14:16 +0000
Subject: [PATCH 3/3] OBS-URL:
 https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=277

---
 libreoffice.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libreoffice.spec b/libreoffice.spec
index b90862c..6e440f7 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1230,6 +1230,7 @@ mv tmplist file-lists/common_list.txt
 echo "%dir %{_datadir}/%{name}/help" >>file-lists/common_list.txt
 mv %{buildroot}/%{_libdir}/%{name}/help/ %{buildroot}/%{_datadir}/%{name}/
 mkdir -p %{buildroot}/%{_libdir}/%{name}/help/
+echo "%dir %{_libdir}/%{name}/help" >>file-lists/common_list.txt
 for file in idxcaption.xsl idxcontent.xsl main_transform.xsl ; do
     mv "%{buildroot}/%{_datadir}/%{name}/help/$file" "%{buildroot}/%{_libdir}/%{name}/help/$file"
     echo "%{_libdir}/%{name}/help/$file" >> file-lists/common_list.txt