Merge branch 'master' into alt-desktop

This commit is contained in:
Anton V. Boyarshinov 2009-08-13 22:13:57 +04:00
commit 5d8bf52292

View File

@ -127,6 +127,7 @@ Summary: KDE4 settings for %Brand %version %Theme
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
%description kde4-settings
KDE4 settings for %Brand %version %Theme
@ -137,6 +138,7 @@ Summary: KDE3 settings for %Brand %version %Theme
License: Distributable
Group: Graphical desktop/KDE
Requires: ksplash-engine-moodin
PreReq: %name-graphics
Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-kde3-settings ";done )
%description kde3-settings
@ -162,7 +164,7 @@ GNOME settings for %Brand %version %Theme
Summary: XFCE settings for %Brand %version %Theme
License: Distributable
Group: Graphical desktop
Group: Graphical desktop/XFce
Requires: PolicyKit-gnome
Obsoletes: xfce-settings-lite xfce-settings-school-lite
Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-xfce-settings ";done )
@ -327,8 +329,8 @@ install -m 644 etcskel/.Xdefaults %buildroot/etc/skel/
mkdir -p %buildroot/usr/share/xfce4/backdrops
install -m 644 backgrounds/* %buildroot/usr/share/xfce4/backdrops
mkdir -p '%buildroot/usr/share/themes/ALTLinux-%Theme/gtk-2.0'
install -m 644 'themes/ALTLinux/gtk-2.0/* %buildroot/usr/share/themes/ALTLinux-%Theme/gtk-2.0/'
install -m 644 'themes/ALTLinux/*.png %buildroot/usr/share/themes/ALTLinux-%Theme/'
install -m 644 themes/ALTLinux/gtk-2.0/* '%buildroot/usr/share/themes/ALTLinux-%Theme/gtk-2.0/'
install -m 644 themes/ALTLinux/*.png '%buildroot/usr/share/themes/ALTLinux-%Theme/'
mkdir -p %buildroot/%_bindir
install -m 644 bin/* %buildroot/%_bindir