diff --git a/branding.spec b/branding.spec index 69a15e1..15de692 100644 --- a/branding.spec +++ b/branding.spec @@ -21,15 +21,15 @@ Url: https://basealt.ru %ifarch %ix86 x86_64 BuildRequires: gfxboot >= 4 -BuildRequires: cpio fonts-ttf-dejavu fonts-ttf-google-droid-sans -BuildRequires: design-bootloader-source >= 5.0-alt2 fribidi %endif +BuildRequires: cpio fonts-ttf-dejavu fonts-ttf-google-droid-sans +BuildRequires: design-bootloader-source >= 5.0-alt2 BuildRequires(pre): rpm-macros-branding BuildRequires: libalternatives-devel BuildRequires: qt5-base-devel -BuildRequires: ImageMagick fontconfig bc +BuildRequires: ImageMagick fontconfig bc fribidi Source: branding.tar @@ -203,9 +203,15 @@ Requires(post): indexhtml-common %prep %setup -n branding +%ifnarch %arm +%define x86 boot +%else +%define x86 %nil +%endif + %build autoconf -THEME=%theme NAME='%Brand %Theme' BRAND_FNAME='%brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%distro_name_ru' PRODUCT_NAME='%distro_name' CODENAME='%codename' ./configure +THEME=%theme NAME='%Brand %Theme' BRAND_FNAME='%brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%distro_name_ru' PRODUCT_NAME='%distro_name' CODENAME='%codename' X86='%x86' ./configure make %install @@ -213,29 +219,30 @@ make find %buildroot -name \*.in -delete #bootloader -%ifarch %ix86 x86_64 %pre bootloader +%ifarch %ix86 x86_64 [ -s /usr/share/gfxboot/%theme ] && rm -fr /usr/share/gfxboot/%theme ||: +%endif +%ifarch %ix86 x86_64 aarch64 [ -s /boot/splash/%theme ] && rm -fr /boot/splash/%theme ||: %endif %post bootloader -[ "$1" -eq 1 ] || exit 0 -%ifarch %ix86 x86_64 +%ifarch %ix86 x86_64 aarch64 ln -snf %theme/message /boot/splash/message . /etc/sysconfig/i18n lang=$(echo $LANG | cut -d. -f 1) cd boot/splash/%theme/ echo $lang > lang [ "$lang" = "C" ] || echo lang | cpio -o --append -F message -%endif . 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 shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_NORMAL %grub_normal shell_config_set /etc/sysconfig/grub2 GRUB_COLOR_HIGHLIGHT %grub_high +%endif -%ifarch %ix86 x86_64 +%ifarch %ix86 x86_64 aarch64 %preun bootloader [ "$1" -eq 0 ] || exit 0 [ "`readlink /boot/splash/message`" != "%theme/message" ] ||