From 1eec5f48571ff1aa788d687b764fc7bbcd831f1e2a3ae1ca4b70c25e749b44f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 22 Jan 2014 15:48:10 +0000 Subject: [PATCH] - Add missing %dir directives. - Add back rpmlintrc as it is still needed - Update comment about sfir icons OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=85 --- libreoffice-rpmlintrc | 2 ++ libreoffice.changes | 11 +++++++++++ libreoffice.spec | 7 ++++++- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 libreoffice-rpmlintrc diff --git a/libreoffice-rpmlintrc b/libreoffice-rpmlintrc new file mode 100644 index 0000000..255ba14 --- /dev/null +++ b/libreoffice-rpmlintrc @@ -0,0 +1,2 @@ +# libreoffice devel package is de facto called libreoffice-sdk +addFilter("devel-file-in-non-devel-package") diff --git a/libreoffice.changes b/libreoffice.changes index 5d840b2..6166979 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jan 22 15:47:21 UTC 2014 - tchvatal@suse.com + +- Add missing %dir directives. + +------------------------------------------------------------------- +Wed Jan 22 15:42:03 UTC 2014 - tchvatal@suse.com + +- Add back rpmlintrc as it is still needed +- Update comment about sfir icons + ------------------------------------------------------------------- Fri Jan 17 20:19:39 UTC 2014 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index 56a5625..06f5455 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -605,11 +605,16 @@ This package provides extensions for LibreOffice Writer: # Crazy magic for the auto help/lang generating. # Inspired and adjusted from Fedora spec. %define _langpack_common() \ +%dir %{_datadir}/%{name}/program/resource \ %{_datadir}/%{name}/program/resource/*%{1}.res \ %if "%{1}" != "en-US" \ +%dir %{_datadir}/%{name}/share/config/soffice.cfg \ +%dir %{_datadir}/%{name}/share/config/soffice.cfg/modules \ %{_datadir}/%{name}/share/config/soffice.cfg/modules/*/ui/res/%{1}.zip \ %{_datadir}/%{name}/share/config/soffice.cfg/*/ui/res/%{1}.zip \ %endif \ +%dir %{_datadir}/%{name}/share/registry \ +%dir %{_datadir}/%{name}/share/registry/res \ %{_datadir}/%{name}/share/registry/Langpack-%{1}.xcd \ %if "%{1}" != "en-US" \ %{_datadir}/%{name}/share/registry/res/registry_%{1}.xcd \ @@ -1049,7 +1054,7 @@ rm -rf translations/source/ # Not worth fixing unless really cleaning up the install completely cat file-lists/kde_list.txt >> file-lists/kde4_list.txt -# Unused theme +# FIXME: package sifr theme properly rm -rf %{buildroot}%{_datadir}/%{name}/share/config/images_sifr.zip # Remove pointless readmes