Accepting request 307796 from LibreOffice:Factory

- One more fix for help handling bnc#915996

OBS-URL: https://build.opensuse.org/request/show/307796
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libreoffice?expand=0&rev=92

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
 

libreoffice.spec

@@ -1229,9 +1229,11 @@ 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
+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
-    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/
@@ -1320,26 +1322,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