Clean spec file

branding.spec

+%define brand school
+%define Brand School
 %define theme teacher
+%define Theme Teacher
 %define Name School Teacher
 %define codename Turdus pilaris
 %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-terminal altlinux-centaurus sisyphus-server-light simply-linux
-%define brand school
 %define status альфа
 %define status_en alpha
 %define distro_name Informika 6.9.9 School Teacher (alpha)
@@ -41,10 +43,9 @@ Summary(ru_RU.UTF-8): Тема для экрана выбора варианто
 License: GPLv2+
 
 PreReq:    coreutils
-Provides: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
-
-Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
-Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-bootloader ";done )
+Provides:  design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
+Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-bootloader ";done )
 
 %define grub_normal white/light-blue
 %define grub_high black/light-gray
@@ -58,8 +59,9 @@ Suitable for both lilo and syslinux.
 для дистрибутива %distro_name_ru.
 
 %package bootsplash
+BuildArch: noarch
 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
 Group:    System/Configuration/Boot and Init
 Provides: plymouth-theme-%theme
@@ -119,7 +121,6 @@ This package contains some graphics for %distro_name design.
 В данном пакете находится необходимые графические элементы для дистрибутива 
 %distro_name_ru.
 
-
 %define provide_list altlinux fedora redhat system altlinux
 %define obsolete_list altlinux-release fedora-release redhat-release
 %define conflicts_list altlinux-release-sisyphus altlinux-release-4.0 altlinux-release-5.0 altlinux-release-5.1 altlinux-release-junior altlinux-release-master altlinux-release-server altlinux-release-terminal altlinux-release-small_business
@@ -141,14 +142,15 @@ Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-r
 В данном пакете находится описание дистрибутива %distro_name_ru.
 
 %package notes
+BuildArch: noarch
 Provides:  alt-license-theme = %version alt-notes-%theme
 Obsoletes: alt-license-%theme alt-notes-%theme
 Summary:   Distribution license and release notes
 Summary(ru_RU.UTF-8): Лицензия и дополнительные сведения для дистрибутива %distro_name_ru
 License:   Distributable
 Group:     Documentation
-Conflicts: alt-notes-children alt-notes-hpc alt-notes-junior alt-notes-junior-sj alt-notes-junior-sm alt-notes-school-server alt-notes-server-lite alt-notes-skif alt-notes-terminal alt-notes-desktop
-Conflicts: %(for n in %variants ; do [ "$n" = %theme ] || echo -n "branding-$n-notes ";done )
+Conflicts: alt-notes-children alt-notes-hpc alt-notes-junior alt-notes-junior-sj alt-notes-junior-sm alt-notes-office-server alt-notes-server-lite alt-notes-skif alt-notes-terminal 
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-notes ";done )
 
 %description notes
 Distribution license and release notes
@@ -188,7 +190,9 @@ Slideshow for %distro_name installer.
 дистрибутива %distro_name_ru.
 
 %package indexhtml
+BuildArch: noarch
 Summary: %distro_name welcome page
+Summary:  HTML welcome page for %distro_name
 Summary(ru_RU.UTF-8): Стартовая страница для дистрибутива %distro_name_ru
 License:  distributable
 Group:    System/Base
@@ -210,7 +214,7 @@ Requires: docs-linux_intro
 Requires(post): indexhtml-common
 
 %description indexhtml
-%distro_name index.html welcome page.
+%distro_name welcome page.
 
 %description indexhtml -l ru_RU.UTF-8
 В данном пакете содержится стартовая страница для дистрибутива