From bf5d0895214ab9621ec9ebd5cc1450f49edc6aee77aeb1ef41e44f9e36daad99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 24 Aug 2017 07:45:13 +0000 Subject: [PATCH] - Fix fail to build with kde integration disabled wrt bsc#1055393 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=524 --- libreoffice.changes | 5 +++++ libreoffice.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/libreoffice.changes b/libreoffice.changes index 2dbf3b2..30f0606 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Aug 24 07:46:20 UTC 2017 - tchvatal@suse.com + +- Fix fail to build with kde integration disabled wrt bsc#1055393 + ------------------------------------------------------------------- Fri Aug 11 09:24:28 UTC 2017 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index d32f360..42ecae8 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1196,7 +1196,11 @@ for appdata in base calc draw impress writer; do %endif rm -rf %{buildroot}%{_datadir}/appdata/libreoffice-${appdata}.appdata.xml done +%if %{with kdeintegration} echo "%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml" >>file-lists/kde4_list.txt +%else +rm -f %{buildroot}%{_datadir}/appdata/org.libreoffice.kde.metainfo.xml +%endif # Remove pointless readmes rm -rf %{buildroot}%{_libdir}/%{name}/readmes/