From 7e6df19cf55cbf4ae6d6dce78c31493d8135c1a6 Mon Sep 17 00:00:00 2001 From: Andrey Bondrov Date: Thu, 16 Nov 2017 00:44:03 +1000 Subject: [PATCH] Make sure to build Oxygen icon theme, it's used in KDE 4 --- libreoffice.spec | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/libreoffice.spec b/libreoffice.spec index 78a0db2..ff1549b 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -341,8 +341,6 @@ Obsoletes: %{name}-dtd-officedocument1.0 < %{EVRD} Conflicts: %{name}-extension-xsltfilter < %{EVRD} Obsoletes: %{name}-extension-xsltfilter < %{EVRD} Conflicts: %{name}-openclipart < 1:5.1.2-2 -Obsoletes: %{name}-style-oxygen < %{EVRD} -Conflicts: %{name}-style-oxygen < %{EVRD} Obsoletes: %{name}-extension-barcode < %{EVRD} Conflicts: %{name}-extension-barcode < %{EVRD} Obsoletes: %{name}-extension-gdocs < %{EVRD} @@ -514,6 +512,7 @@ Summary: KDE4 Integration for LibreOffice (Widgets, Dialogs, Addressbook) Group: Office Requires: %{name}-common = %{EVRD} Suggests: %{name}-style-breeze = %{EVRD} +Requires: %{name}-style-oxygen = %{EVRD} %description kde4 This package contains the KDE4 plugin for drawing LibreOffice widgets with @@ -637,6 +636,20 @@ enabled in the LibreOffice option menu. #---------------------------------------------------------------------------- +%package style-oxygen +Summary: Oxygen symbol style for LibreOffice +Group: Office +Requires: %{name}-common = %{EVRD} +Provides: %{name}-style = %{EVRD} + +%description style-oxygen +This package contains the "oxygen" symbol style, default style for KDE4. + +%files style-oxygen +%{ooodir}/share/config/images_oxygen.zip + +#---------------------------------------------------------------------------- + %package style-sifr Summary: Sifr symbol style for LibreOffice Group: Office @@ -2967,6 +2980,7 @@ touch autogen.lastrun %{?_smp_mflags:--with-parallelism="`getconf _NPROCESSORS_ONLN`"} \ --with-vendor=ROSA \ --with-build-version="ROSA %{buildver}-%{release}" \ + --with-theme="breeze breeze_dark galaxy hicontrast oxygen sifr tango" \ --disable-coinmp \ --disable-fetch-external \ --enable-gstreamer-1.0 \ @@ -3151,7 +3165,7 @@ sort -u file-lists/sdk_list.txt > file-lists/sdk_list.uniq.sorted.txt sed -i -e 's/\[/?/g;s/\]/?/g' file-lists/sdk*.txt ## styles have their own packages -for i in galaxy breeze hicontrast tango sifr; do +for i in oxygen galaxy breeze hicontrast tango sifr; do sed -i "/^.*images_$i\.zip$/d" file-lists/common_list.txt done # galaxy style too