Package all styles, move breeze_dark from -common to -style-breeze

This commit is contained in:
Mikhail Novosyolov 2020-04-05 23:24:22 +03:00
parent 0d50bd925b
commit 4d7cb53060

View file

@ -664,49 +664,30 @@ This package contains the Python bindings for the UNO library.
#----------------------------------------------------------------------------
%package style-breeze
Summary: Breeze symbol style for LibreOffice
Group: Office
Requires: %{name}-common = %{EVRD}
Provides: %{name}-style = %{EVRD}
Obsoletes: %{name}-style-crystal < 1:5.1.1
%define style_package()\
%{expand:\
%%package style-%1 \
Summary: %1 symbol style for LibreOffice \
Group: Office \
Requires: %{name}-common = %{EVRD} \
Provides: %{name}-style = %{EVRD} \
Obsoletes: %{name}-common < 1:6.3.5 \
Conflicts: %{name}-common < 1:6.3.5 \
\
%%description style-%1 \
%1 symbol style for LibreOffice \
\
%%files style-%1 \
%{ooodir}/share/config/images_%{1}*.zip
} \
%{nil}
%description style-breeze
This package contains the "breeze" symbol style, needs to be manually
enabled in the LibreOffice option menu.
%files style-breeze
%{ooodir}/share/config/images_breeze.zip
#----------------------------------------------------------------------------
%package style-sifr
Summary: Sifr symbol style for LibreOffice
Group: Office
Requires: %{name}-common = %{EVRD}
Provides: %{name}-style = %{EVRD}
Conflicts: %{name}-common < 1:5.1.1
%description style-sifr
This package contains the "sifr" symbol style, needs to be manually
enabled in the LibreOffice option menu.
%files style-sifr
%{ooodir}/share/config/images_sifr.zip
#----------------------------------------------------------------------------
%package style-tango
Summary: Tango symbol style for LibreOffice
Group: Office
Requires: %{name}-common = %{EVRD}
Provides: %{name}-style = %{EVRD}
%description style-tango
This package contains the "tango" symbol style, default style for GTK/Gnome.
%files style-tango
%{ooodir}/share/config/images_tango.zip
%style_package breeze
%style_package colibre
%style_package elementary
%style_package karasa_jaga
%style_package sifr
%style_package tango
#----------------------------------------------------------------------------
@ -3002,7 +2983,6 @@ sed -i \
%{?_smp_mflags:--with-parallelism="`getconf _NPROCESSORS_ONLN`"} \
--with-vendor=ROSA \
--with-build-version="ROSA %{buildver}-%{release}" \
--with-theme="breeze breeze_dark sifr tango" \
--disable-coinmp \
--disable-fetch-external \
--with-external-tar="$EXTSRCDIR" \
@ -3179,11 +3159,6 @@ sort -u file-lists/sdk_list.txt > file-lists/sdk_list.uniq.sorted.txt
# Fix weirdo filenames wreaking havoc because they're regular expressions
sed -i -e 's/\[/?/g;s/\]/?/g' file-lists/sdk*.txt
## styles have their own packages
for i in breeze tango sifr; do
sed -i "/^.*images_$i\.zip$/d" file-lists/common_list.txt
done
## Split help
cd file-lists
for i in lang_*.txt; do
@ -3212,6 +3187,9 @@ cat file-lists/core_list.uniq.sorted.txt > file-lists/core_list.txt
egrep -v "libreoffice/share/xdg/(base|calc|draw|impress|math|writer)" file-lists/core_list.txt > file-lists/core_list.uniq.sorted.txt
cat file-lists/core_list.uniq.sorted.txt > file-lists/core_list.txt
## styles have their own packages
sed -E -i -e "/^.*images_.*\.zip$/d" file-lists/common_list.txt
# files for help-* and l10n-* packages
%if %{with l10n}
%{expand:%(for i in %{langs}; do