Commit 1058c8b1 authored by Sergey V Turchin's avatar Sergey V Turchin

- remove conflicts for bootloader and graphics

parent 36af1653
%define theme desktop
%define Theme Desktop %define Theme Desktop
%define codename Inula Helenium %define codename Inula Helenium
%define brand altlinux %define brand altlinux
%define Brand ALT Linux %define Brand ALT Linux
%define theme branding-%brand-kdesktop
%define status beta
%define status_en beta
%define variants altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
Name: branding-%brand-%theme Name: %theme
Version: 5.0.0 Version: 5.0.0
Release: alt25 Release: alt25
BuildArch: noarch BuildArch: noarch
...@@ -19,13 +22,6 @@ BuildRequires: libqt4-devel ...@@ -19,13 +22,6 @@ BuildRequires: libqt4-devel
BuildRequires: ImageMagick fontconfig bc libGConf-devel BuildRequires: ImageMagick fontconfig bc libGConf-devel
%define Theme Desktop
%define status beta
%define status_en beta
%define variants altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
Packager: Anton V. Boyarshinov <boyarsh at altlinux dot org>
Source: branding.tar Source: branding.tar
Group: Graphics Group: Graphics
...@@ -44,7 +40,6 @@ PreReq: coreutils ...@@ -44,7 +40,6 @@ PreReq: coreutils
Provides: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader 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 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" = %brand-%theme ] || echo -n "branding-$n-bootloader ";done )
%description bootloader %description bootloader
Here you find the graphical boot logo. Suitable for both lilo and syslinux. Here you find the graphical boot logo. Suitable for both lilo and syslinux.
...@@ -86,7 +81,6 @@ Group: Graphics ...@@ -86,7 +81,6 @@ Group: Graphics
Provides: design-graphics-%theme branding-alt-%theme-graphics Provides: design-graphics-%theme branding-alt-%theme-graphics
Obsoletes: branding-alt-%theme-graphics design-graphics-%theme Obsoletes: branding-alt-%theme-graphics design-graphics-%theme
PreReq(post,preun): alternatives >= 0.2 PreReq(post,preun): alternatives >= 0.2
Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-graphics ";done )
%description graphics %description graphics
This package contains some graphics for ALT design. This package contains some graphics for ALT design.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment