diff --git a/libreoffice.changes b/libreoffice.changes index b9e6cfd..a1b342f 100644 --- a/libreoffice.changes +++ b/libreoffice.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 2 12:55:31 UTC 2016 - tchvatal@suse.com + +- Do not bother with kde integration on SLE12 + ------------------------------------------------------------------- Sun Feb 21 09:49:35 UTC 2016 - tchvatal@suse.com diff --git a/libreoffice.spec b/libreoffice.spec index a671cdc..794245b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -47,6 +47,12 @@ %else %bcond_with systemlibs %endif +# Wether to enable the kde integration +%if 0%{?suse_version} > 1315 || 0%{?is_opensuse} || 0%{?suse_version} < 1130 +%bcond_without kdeintegration +%else +%bcond_with kdeintegration +%endif # Wether to provide noarch subpackages %if 0%{?suse_version} > 1130 %bcond_without noarch_subpkgs @@ -203,7 +209,6 @@ BuildRequires: krb5-devel BuildRequires: libcppunit-devel BuildRequires: liberation-fonts BuildRequires: libexpat-devel -BuildRequires: libkde4-devel BuildRequires: libpoppler-devel BuildRequires: libtool BuildRequires: make @@ -256,6 +261,9 @@ Provides: %{name}-icon-theme-crystal = %{version} Obsoletes: %{name}-icon-theme-crystal < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %arm %ix86 x86_64 ppc ppc64 +%if %{with kdeintegration} +BuildRequires: libkde4-devel +%endif %if %{with systemlibs} BuildRequires: boost-devel BuildRequires: bsh2 @@ -272,6 +280,7 @@ BuildRequires: graphite2-devel >= 0.9.3 BuildRequires: harfbuzz-devel BuildRequires: icu BuildRequires: junit4 +BuildRequires: libXt-devel BuildRequires: libabw-devel BuildRequires: libbase BuildRequires: libcdr-devel >= 0.1 @@ -1187,7 +1196,11 @@ export NOCONFIGURE=yes --with-external-thes-dir=%{_datadir}/mythes \ --with-help \ --enable-odk \ +%if %{with kdeintegration} --enable-kde4 \ +%else + --disable-kde4 \ +%endif --enable-evolution2 \ --enable-dbus \ --enable-hardlink-deliver \ @@ -1616,8 +1629,10 @@ test -f /sbin/conf.d/SuSEconfig.glib2 && SuSEconfig --module glib2 > /dev/null | %files -f file-lists/gnome_list.txt gnome %defattr(-,root,root) +%if %{with kdeintegration} %files -f file-lists/kde4_list.txt kde4 %defattr(-,root,root) +%endif %files -f file-lists/officebean_list.txt officebean %defattr(-,root,root)