From 459fd46229202d979b0b281e4d09b928e90af7fb51736a7a84aa127e12dee690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sun, 5 Jan 2014 20:08:04 +0000 Subject: [PATCH] - Fix branding filelist and remove old help location from filelist OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=69 --- libreoffice.changes | 5 +++++ libreoffice.spec | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libreoffice.changes b/libreoffice.changes index cfb800f..ec4fb67 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jan 5 20:07:46 UTC 2014 - tchvatal@suse.com + +- Fix branding filelist and remove old help location from filelist + ------------------------------------------------------------------- Sat Jan 4 10:54:18 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 8daebdf..2bbe44c 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -987,8 +987,10 @@ for i in %{buildroot}%{_libdir}/%{name}/share/config/soffice.cfg/modules/*/ui/re done # help files are luckily in just one folder mkdir -p %{buildroot}/%{_datadir}/%{name}/help/ +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} +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 for file in idxcaption.xsl idxcontent.xsl main_transform.xsl ; do @@ -1017,7 +1019,7 @@ for file in sofficerc \ shell/backing_space.png ; do mv "%{buildroot}%{_libdir}/%{name}/program/$file" "%{buildroot}%{_datadir}/%{name}/program/$file" ln -sf "%{_datadir}/%{name}/program/$file" "%{buildroot}/%{_libdir}/%{name}/program/$file" - echo "%{buildroot}%{_datadir}/%{name}/program/$file" >> file-lists/branding-upstream.txt + echo "%{_datadir}/%{name}/program/$file" >> file-lists/branding_upstream.txt done ################