Commit bc1c8b8c authored by Mikhail Efremov's avatar Mikhail Efremov Committed by Alexey Shabalin

bootsplash,bootloader: Package grub and plymouth themes on all arches

parent 14bb4d58
...@@ -75,11 +75,10 @@ Summary: Theme for splash animations during bootup ...@@ -75,11 +75,10 @@ Summary: Theme for splash animations during bootup
Summary(ru_RU.UTF-8): Тема для экрана загрузки для дистрибутива %distro_name_ru Summary(ru_RU.UTF-8): Тема для экрана загрузки для дистрибутива %distro_name_ru
License: Distributable License: Distributable
Group: System/Configuration/Boot and Init Group: System/Configuration/Boot and Init
%ifarch %ix86 x86_64 BuildArch: noarch
Provides: plymouth-theme-%theme Provides: plymouth-theme-%theme
Requires: plymouth-plugin-script Requires: plymouth-plugin-script
Requires(pre): plymouth Requires(pre): plymouth
%endif
%branding_add_conflicts %flavour bootsplash %branding_add_conflicts %flavour bootsplash
...@@ -236,12 +235,12 @@ lang=$(echo $LANG | cut -d. -f 1) ...@@ -236,12 +235,12 @@ lang=$(echo $LANG | cut -d. -f 1)
cd boot/splash/%theme/ cd boot/splash/%theme/
echo $lang > lang echo $lang > lang
[ "$lang" = "C" ] || echo lang | cpio -o --append -F message [ "$lang" = "C" ] || echo lang | cpio -o --append -F message
%endif
. shell-config . shell-config
shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme/theme.txt shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme/theme.txt
#shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme #shell_config_set /etc/sysconfig/grub2 GRUB_THEME /boot/grub/themes/%theme
shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_NORMAL %grub_normal shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_NORMAL %grub_normal
shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
%endif
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%preun bootloader %preun bootloader
...@@ -257,17 +256,15 @@ shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high ...@@ -257,17 +256,15 @@ shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high
%ifarch %ix86 x86_64 %ifarch %ix86 x86_64
%_datadir/gfxboot/%theme %_datadir/gfxboot/%theme
/boot/splash/%theme /boot/splash/%theme
/boot/grub/themes/%theme
%endif %endif
/boot/grub/themes/%theme
#bootsplash #bootsplash
%post bootsplash %post bootsplash
%ifarch %ix86 x86_64
subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
[ -f /etc/sysconfig/grub2 ] && \ [ -f /etc/sysconfig/grub2 ] && \
subst "s|GRUB_WALLPAPER=.*|GRUB_WALLPAPER=/usr/share/plymouth/themes/%theme/grub.jpg|" \ subst "s|GRUB_WALLPAPER=.*|GRUB_WALLPAPER=/usr/share/plymouth/themes/%theme/grub.jpg|" \
/etc/sysconfig/grub2 ||: /etc/sysconfig/grub2 ||:
%endif
#release #release
%post release %post release
...@@ -293,9 +290,7 @@ fi ...@@ -293,9 +290,7 @@ fi
#_iconsdir/hicolor/*/apps/alt-%theme.png #_iconsdir/hicolor/*/apps/alt-%theme.png
%files bootsplash %files bootsplash
%ifarch %ix86 x86_64
%_datadir/plymouth/themes/%theme/* %_datadir/plymouth/themes/%theme/*
%endif
%files release %files release
%dir %data_cur_dir %dir %data_cur_dir
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment