Merge branch 'gnome-linbook' into junior

branding.spec

-%define theme lite
+%define theme junior
 %define codename none
 %define brand school
 %define Brand ALT Linux 
 
-
 Name: branding-%brand-%theme
 Version: 5.0.0
 Release: alt27
@@ -18,11 +17,13 @@ BuildRequires: libqt4-devel
 
 BuildRequires: ImageMagick fontconfig bc libGConf-devel
 
-%define Theme Lite 
+%define Theme Junior
 %define status beta
 %define status_en beta
 %define variants altlinux-desktop altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
 
+Packager: Alexandra Panyukova <mex3@altlinux.ru>
+
 Source: branding.tar
 
 Group: Graphics
@@ -119,17 +120,15 @@ Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "brandi
 %description notes
 Distribution license and release notes
 
-%package xfce-settings
-
-Summary: XFCE settings for %Brand %version %Theme
+%package gnome-settings
+Summary: GNOME settings for %Brand %version %Theme
 License: Distributable
-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 )
+Group: Graphical desktop/KDE
+Requires: gtk2-theme-mist
+Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-kde3-settings ";done )
 
-%description xfce-settings
-XFCE settings for %Brand %version %Theme
+%description gnome-settings
+GNOME settings for %Brand %version %Theme
 
 %package slideshow
 
@@ -204,6 +203,16 @@ pushd notes
 %makeinstall
 popd
 
+#gnome-settings
+pushd gnome-settings
+mkdir -p %buildroot/%_datadir/themes/%brand-%theme
+mkdir -p %buildroot/%_datadir/themes/%brand-%theme/gtk-2.0
+install -m 644 gtkrc %buildroot/%_datadir/themes/%brand-%theme/gtk-2.0
+mkdir -p %buildroot/%_datadir/themes/%brand-%theme/metacity-1
+install -m 644 metacity-theme-1.xml %buildroot/%_datadir/themes/%brand-%theme/metacity-1/
+install -m 644 index.theme %buildroot/%_datadir/themes/%brand-%theme/
+popd
+
 #slideshow
 mkdir -p %buildroot/usr/share/install2/slideshow
 install slideshow/*  %buildroot/usr/share/install2/slideshow/
@@ -305,6 +314,9 @@ echo $lang > lang
 %files notes
 %_datadir/alt-notes/*
 
+%files gnome-settings
+%_datadir/themes/%brand-%theme/*
+
 %files slideshow
 /usr/share/install2/slideshow
 

gnome-settings/gtkrc.in

 gtk-color-scheme =
-"bg_color:#eaeaea\nfg_color:#000\nbase_color:#fff\ntext_color:#000\nselected_fg_color:#fff\nselected_bg_color:@MIDDLE_COLOR_HEX@"
+"bg_color:#eaeaea\nfg_color:#000\nbase_color:#fff\ntext_color:#000\nselected_fg_color:#fff\nselected_bg_color:#@MIDDLE_COLOR_HEX@"
 
 style "default"
 {