Fix substitution variables and typo in requirements

branding.spec

 %define theme server
 %define Theme School Server
 %define codename Aquila chrysaetos
+%define variants altlinux-backup-server altlinux-desktop altlinux-gnome-desktop altlinux-kdesktop altlinux-lite altlinux-lxdesktop altlinux-office-desktop altlinux-office-server altlinux-school-server altlinux-sisyphus altlinux-spt altlinux-tablet altlinux-workbench informika-schoolmaster ivk-chainmail lxde-desktop lxde-school-lite Platform6-server-light school-junior school-lite school-master school-server school-teacher school-terminal simply-linux sisyphus-server-light 
 %define brand school
 %define status альфа
 %define status_en alpha
@@ -11,7 +12,7 @@ Name: branding-%brand-%theme
 Version: 6.9.9 
 Release: alt1
 
-BuildRequires: cpio fonts-ttf-dejavu fonts-ttСерверd
+BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-droid
 BuildRequires: design-bootloader-source >= 5.0-alt2
 %ifnarch %arm
 BuildRequires: cpio gfxboot >= 4 
@@ -23,14 +24,6 @@ BuildRequires: libqt4-devel
 
 BuildRequires: ImageMagick fontconfig bc libGConf-devel
 
-%define status_en %nil
-%define status %nil
-%define ProductName_ru Альт Линукс 7.0 Кентавр
-
-# All existing branding without this branding
-%define variants altlinux-backup-server altlinux-desktop altlinux-gnome-desktop altlinux-kdesktop altlinux-lite altlinux-lxdesktop altlinux-office-desktop altlinux-office-server altlinux-school-server altlinux-sisyphus altlinux-spt altlinux-tablet altlinux-workbench informika-schoolmaster ivk-chainmail lxde-desktop lxde-school-lite Platform6-server-light school-junior school-lite school-master school-server school-teacher school-terminal simply-linux sisyphus-server-light 
-
-
 Source: branding.tar
 
 Group: Graphics
@@ -221,7 +214,7 @@ ALT Linux index.html welcome page.
 
 %build
 autoconf
-THEME=%theme NAME='%Theme' BRAND_FNAME='%Brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version PRODUCT_NAME_RU='%ProductName_ru' CODENAME='%codename' X86='%x86' ./configure 
+THEME=%theme NAME='%name' 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