Fix disto name in merge

This commit is contained in:
Andrey Cherepanov 2013-11-20 19:30:16 +04:00
parent 07a7bceee3
commit 0328fc754f

View File

@ -1,8 +1,8 @@
%define brand school
%define Brand School
%define theme junior
%define Theme Junior
%define codename Parus major
%define theme teacher
%define Theme 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-teacher school-terminal simply-linux sisyphus-server-light altlinux-centaurus
%define status альфа
%define status_en alpha
@ -34,9 +34,6 @@ Group: Graphics
Summary: System/Base
License: GPLv2+
Provides: branding-informika-schoolmaster = %version-%release
Obsoletes: branding-informika-schoolmaster < %version-%release
%description
Distro-specific packages with design and texts for %distro_name.
@ -77,9 +74,6 @@ PreReq: plymouth
Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-bootsplash ";done )
Provides: branding-informika-schoolmaster-bootsplash = %version-%release
Obsoletes: branding-informika-schoolmaster-bootsplash < %version-%release
%description bootsplash
This package contains graphics for boot process for %distro_name
(needs console splash screen enabled).
@ -100,9 +94,6 @@ Obsoletes: branding-alt-%theme-browser-qt branding-altlinux-%theme-browser-qt
# lexicographically first of the village
Conflicts: branding-sisyphus-server-light-alterator
Provides: branding-informika-schoolmaster-alterator = %version-%release
Obsoletes: branding-informika-schoolmaster-alterator < %version-%release
Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-alterator ";done )
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
@ -148,9 +139,6 @@ 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 )
Provides: branding-informika-schoolmaster-release = %version-%release
Obsoletes: branding-informika-schoolmaster-release < %version-%release
%description release
%distro_name release file.
@ -182,8 +170,6 @@ 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
Provides: branding-informika-schoolmaster-kde4-settings = %version-%release
Obsoletes: branding-informika-schoolmaster-kde4-settings < %version-%release
%description kde4-settings
KDE4 settings for %distro_name
@ -199,8 +185,6 @@ 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
Provides: branding-informika-schoolmaster-xfce-settings = %version-%release
Obsoletes: branding-informika-schoolmaster-xfce-settings < %version-%release
%description xfce-settings
XFCE settings for %distro_name
@ -238,8 +222,6 @@ License: Distributable
Group: System/Configuration/Other
Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-slideshow ";done )
Provides: branding-informika-schoolmaster-slideshow = %version-%release
Obsoletes: branding-informika-schoolmaster-slideshow < %version-%release
BuildArch: noarch
%description slideshow
@ -259,8 +241,6 @@ 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 )
Provides: branding-informika-schoolmaster-indexhtml = %version-%release
Obsoletes: branding-informika-schoolmaster-indexhtml < %version-%release
Conflicts: indexhtml-sisyphus
Conflicts: indexhtml-school_junior
Conflicts: indexhtml-school_lite
@ -289,9 +269,6 @@ Group: Graphical desktop/Other
Requires(pre): altlinux-freedesktop-menu-common
Requires: altlinux-freedesktop-menu-common
Provides: branding-informika-schoolmaster-menu = %version-%release
Obsoletes: branding-informika-schoolmaster-menu < %version-%release
%description menu
Menu for %distro_name