Use %branding_add_conflicts for all subpackages

branding.spec

@@ -3,18 +3,18 @@
 %define theme education
 %define Theme Education
 %define codename Parus major
-%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-junior school-master school-server school-teacher school-terminal simply-linux sisyphus-server-light altlinux-centaurus alt-server alt-workstation xalt-kworkstation
 %define status %nil
 %define status_en %nil
 %define distro_name ALT Education 8.0%status_en
 %define distro_name_ru Альт Образование 8.0%status
+%define flavour %brand-%theme
 
 %define design_graphics_abi_epoch 0
 %define design_graphics_abi_major 12
 %define design_graphics_abi_minor 0
 %define design_graphics_abi_bugfix 0
 
-Name: branding-%brand-%theme
+Name: branding-%flavour
 Version: 8.0
 Release: alt0.3.M80P.1
 BuildArch: noarch
@@ -22,6 +22,7 @@ BuildArch: noarch
 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu fonts-ttf-google-droid-sans
 BuildRequires: design-bootloader-source >= 5.0-alt2
 
+BuildRequires(pre): rpm-macros-branding
 BuildRequires(pre): libqt4-core
 BuildRequires: libalternatives-devel
 BuildRequires: libqt4-devel
@@ -49,7 +50,7 @@ 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 )
+%branding_add_conflicts %flavour bootloader
 
 %define grub_normal white/light-blue
 %define grub_high black/light-gray
@@ -72,7 +73,7 @@ Provides: plymouth-theme-%theme
 Requires: plymouth-plugin-script
 PreReq:   plymouth
 
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-bootsplash ";done )
+%branding_add_conflicts %flavour bootsplash
 
 %description bootsplash
 This package contains graphics for boot process for %distro_name
@@ -91,10 +92,7 @@ Provides: design-alterator-browser-%theme  branding-alt-%theme-browser-qt brandi
 Provides: alterator-icons design-alterator design-alterator-%theme
 Obsoletes:  branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt 
 
-# lexicographically first of the village
-Conflicts: branding-sisyphus-server-light-alterator
-
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-alterator ";done )
+%branding_add_conflicts %flavour alterator
 Obsoletes: design-alterator-server design-alterator-desktop design-altertor-browser-desktop  design-altertor-browser-server branding-altlinux-backup-server-alterator
 PreReq(post,preun): alternatives >= 0.2 alterator
 
@@ -116,7 +114,7 @@ Obsoletes:  branding-alt-%theme-graphics design-graphics-%theme
 Provides: design-graphics = %design_graphics_abi_major.%design_graphics_abi_minor.%design_graphics_abi_bugfix
 
 PreReq(post,preun): alternatives >= 0.2
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-graphics ";done )
+%branding_add_conflicts %flavour graphics
 
 %description graphics
 This package contains some graphics for %distro_name design.
@@ -127,17 +125,15 @@ This package contains some graphics for %distro_name design.
 
 %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
-%package release
 
+%package release
 Summary:  %distro_name release file
 Summary(ru_RU.UTF-8): Описание дистрибутива %distro_name_ru
 License:  GPL
 Group:    System/Configuration/Other
 Provides: %(for n in %provide_list; do echo -n "$n-release = %version-%release "; done) altlinux-release-%theme  branding-alt-%theme-release
 Obsoletes: %obsolete_list  branding-alt-%theme-release
-Conflicts: %conflicts_list
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-release ";done )
+%branding_add_conflicts %flavour release
 
 %description release
 %distro_name release file.
@@ -153,8 +149,7 @@ 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-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 )
+%branding_add_conflicts %flavour notes
 
 %description notes
 Distribution license and release notes
@@ -168,8 +163,8 @@ BuildArch: noarch
 Summary: KDE4 settings for %distro_name
 License: Distributable
 Group:   Graphical desktop/KDE
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-kde4-settings ";done )
 PreReq: %name-graphics
+%branding_add_conflicts %flavour kde4-settings
 
 %description kde4-settings
 KDE4 settings for %distro_name
@@ -181,9 +176,7 @@ Group: Graphical desktop/XFce
 Requires: etcskel gtk3-theme-clearlooks-phenix
 Requires: gnome-icon-theme icon-theme-simple-sl
 Requires: branding-%brand-%theme-graphics
-Obsoletes: xfce-settings-lite xfce-settings-school-lite
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-xfce-settings ";done )
-Conflicts: xfce-settings-simply-linux
+%branding_add_conflicts %flavour xfce-settings
 
 %description xfce-settings
 XFCE settings for %distro_name
@@ -194,7 +187,7 @@ Summary: FVWM2 settings for %distro_name
 License: Distributable
 Group:   Graphical desktop/FVWM based
 Requires: altlinux-freedesktop-menu-gnomish-menu
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-fvwm-settings ";done )
+%branding_add_conflicts %flavour fvwm-settings
 
 %description fvwm-settings
 FVWM2 settings for %distro_name
@@ -207,7 +200,7 @@ Group:   Graphical desktop/GNOME
 Requires: gksu
 Requires: dconf
 Requires: gtk3-theme-clearlooks-phenix
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-gnome-settings ";done )
+%branding_add_conflicts %flavour mate-settings
 PreReq(post): lightdm-gtk-greeter
 PreReq(post): libgio
 
@@ -219,7 +212,7 @@ Summary: Slideshow for %distro_name installer
 Summary(ru_RU.UTF-8): Изображения для организации "слайдшоу" в установщике дистрибутива %distro_name_ru
 License: Distributable
 Group: System/Configuration/Other 
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-slideshow ";done )
+%branding_add_conflicts %flavour slideshow
 
 BuildArch: noarch
 
@@ -238,16 +231,7 @@ License:  distributable
 Group:    System/Base
 Provides: indexhtml indexhtml-%theme = %version indexhtml-Desktop = 1:5.0
 Obsoletes: indexhtml-desktop indexhtml-Desktop
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-indexhtml ";done )
-
-Conflicts: indexhtml-sisyphus
-Conflicts: indexhtml-school_junior
-Conflicts: indexhtml-school_lite
-Conflicts: indexhtml-school_master
-Conflicts: indexhtml-school_terminal
-Conflicts: indexhtml-small_business
-Conflicts: indexhtml-school-server
-Conflicts: branding-altlinux-backup-server-indexhtml
+%branding_add_conflicts %flavour indexhtml
 
 Requires: xdg-utils 
 Requires: docs-alt-education
@@ -267,6 +251,7 @@ License: Distributable
 Group: Graphical desktop/Other
 Requires(pre): altlinux-freedesktop-menu-common
 Requires: altlinux-freedesktop-menu-common
+%branding_add_conflicts %flavour menu
 
 %description menu
 Menu for %distro_name
@@ -277,6 +262,7 @@ License: GPLv2+
 Group: System/Base
 # Really we need lightdm only, but it can pull another greeter.
 Requires: lightdm-gtk-greeter
+%branding_add_conflicts %flavour system-settings
 
 %description system-settings
 Some system settings for Simply Linux.