diff --git a/libreoffice.changes b/libreoffice.changes index b0a4684..a8ca10d 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 2 14:42:45 UTC 2014 - tchvatal@suse.com + +- Switch to ghost files to work without modifying filelist. + ------------------------------------------------------------------- Sat Feb 1 12:09:19 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 70cfa5f..318a106 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1043,8 +1043,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}/ -ln -s %{_datadir}/%{name}/help/ %{buildroot}/%{_libdir}/%{name}/help -echo "%{_libdir}/%{name}/help" >> file-lists/common_list.txt +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 done @@ -1053,8 +1052,7 @@ mkdir -p %{buildroot}/%{_datadir}/%{name}/autotext/ grep -v '%{_libdir}/%{name}/share/autotext' file-lists/common_list.txt > tmplist mv tmplist file-lists/common_list.txt mv %{buildroot}/%{_libdir}/%{name}/share/autotext/ %{buildroot}/%{_datadir}/%{name}/share/ -ln -s %{_datadir}/%{name}/share/autotext/ %{buildroot}/%{_libdir}/%{name}/share/autotext -echo "%{_libdir}/%{name}/share/autotext" >> file-lists/common_list.txt +echo "%ghost %{_libdir}/%{name}/share/autotext" >> file-lists/common_list.txt ################ # branding split @@ -1112,13 +1110,21 @@ rm -rf %{buildroot}%{_libdir}/%{name}/readmes/ # 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" -test -d "$bundled_cache" && rm -rf "$bundled_cache"/* || true; +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" -test -d "$helpdir" && rm -rf "$helpdir" || true ; -test -d "$autotextdir" && rm -rf "$autotextdir" || true ; +if [ -d "$helpdir" ]; then + rm -rf "$helpdir" || true + ln -s "%{_datadir}/%{name}/help" "$helpdir" +fi +if [ -d "$autotextdir" ]; then + rm -rf "$autotextdir" || true + ln -s "%{_datadir}/%{name}/autotext" "$autotextdir" +fi %post /sbin/ldconfig