Merge remote-tracking branch 'boyarsh/centaurus' into kdesktop

branding.spec

@@ -161,6 +161,7 @@ BuildArch: noarch
 Summary: FVWM2 settings for %Brand %version %Theme
 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 )
 
 %description fvwm-settings
@@ -173,6 +174,8 @@ Summary: GNOME settings for %Brand %version %Theme
 License: Distributable
 Group: Graphical desktop/GNOME
 Requires: gtk2-theme-mist
+Requires: altlinux-freedesktop-menu-gnomish-menu
+PreReq: gnome-panel
 Provides: gnome-theme-%brand-%theme = %version-%release
 Provides: metacity-theme-%brand-%theme = %version-%release
 Provides: metacity-theme
@@ -298,15 +301,15 @@ install -m 644 fvwm-settings/.fvwm2rc %buildroot/etc/skel/
 %define XdgThemeName %Brand %Theme
 pushd gnome-settings
 mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName'
+install -m 644  panel-default-setup.entries '%buildroot/%_datadir/themes/%XdgThemeName/'
 mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName/gtk-2.0'
 install -m 644 gtkrc '%buildroot/%_datadir/themes/%XdgThemeName/gtk-2.0'
 mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1'
 install -m 644 metacity-theme-1.xml '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1/'
 install -m 644 index.theme '%buildroot/%_datadir/themes/%XdgThemeName/'
-mkdir -p '%buildroot/etc/gnome/xdg/menus/'
-install -m 644 gnome-applications.menu '%buildroot/etc/gnome/xdg/menus/'
-install -m 644 settings.menu '%buildroot/etc/gnome/xdg/menus/'
-cp -a skel/.gconf  '%buildroot/etc/skel/'
+mkdir -p '%buildroot/etc/xdg/menus/'
+install -m 644 gnome-applications.menu '%buildroot/etc/xdg/menus/'
+install -m 644 settings.menu '%buildroot/etc/xdg/menus/'
 popd
 
 #slideshow
@@ -356,6 +359,13 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 %post gnome-settings
 %gconf2_set string /desktop/gnome/interface/font_name Sans 11
 %gconf2_set string /desktop/gnome/interface/monospace_font_name Monospace 10
+cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \
+/etc/gconf/schemas/panel-default-setup.entries
+/usr/bin/gconftool-2 --direct --config-source=$(/usr/bin/gconftool-2 --get-default-source) \
+--load='/%_datadir/themes/%XdgThemeName/panel-default-setup.entries'
+/usr/bin/gconftool-2 --direct --config-source=$(/usr/bin/gconftool-2 --get-default-source) \
+--load='/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' /apps/panel
+
 
 
 %files alterator
@@ -391,8 +401,7 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 
 %files gnome-settings
 %_datadir/themes/*
-/etc/gnome/xdg/menus
-/etc/skel/.gconf
+/etc/xdg/menus/*
 
 %files slideshow
 /usr/share/install2/slideshow
@@ -407,6 +416,9 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 %_desktopdir/indexhtml.desktop
 
 %changelog
+* Mon Jun 06 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt10
+- automatic 800x600 for virtualbox
+
 * Fri Jun 03 2011 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt17
 - add logos
 - update kdm colors
@@ -417,6 +429,10 @@ subst "s/Theme=.*/Theme=%theme/" /etc/plymouth/plymouthd.conf
 * Wed Jun 01 2011 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt15
 - update basic backgrounds and colors
 
+* Thu May 26 2011 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt9
+- setup default gnome panel
+- .gconf deleted from etcskel
+
 * Tue May 24 2011 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt14
 - change title label to KDesktop
 

gnome-settings/skel/.gconf/apps/panel/applets/applet_0/%gconf.xml

-<?xml version="1.0"?>
-<gconf>
-	<entry name="attached_toplevel_id" mtime="1247751374" schema="/schemas/apps/panel/objects/attached_toplevel_id"/>
-	<entry name="position" mtime="1247751374" schema="/schemas/apps/panel/objects/position" type="int" value="1088"/>
-	<entry name="use_menu_path" mtime="1247751374" schema="/schemas/apps/panel/objects/use_menu_path"/>
-	<entry name="action_type" mtime="1247751374" schema="/schemas/apps/panel/objects/action_type"/>
-	<entry name="toplevel_id" mtime="1247751374" schema="/schemas/apps/panel/objects/toplevel_id" type="string">
-		<stringvalue>top_panel</stringvalue>
-	</entry>
-	<entry name="tooltip" mtime="1247751374" schema="/schemas/apps/panel/objects/tooltip"/>
-	<entry name="use_custom_icon" mtime="1247751374" schema="/schemas/apps/panel/objects/use_custom_icon"/>
-	<entry name="object_type" mtime="1247751374" schema="/schemas/apps/panel/objects/object_type" type="string">
-		<stringvalue>bonobo-applet</stringvalue>
-	</entry>
-	<entry name="panel_right_stick" mtime="1247751374" schema="/schemas/apps/panel/objects/panel_right_stick" type="bool" value="false"/>
-	<entry name="locked" mtime="1247751374" schema="/schemas/apps/panel/objects/locked"/>
-	<entry name="custom_icon" mtime="1247751374" schema="/schemas/apps/panel/objects/custom_icon"/>
-	<entry name="bonobo_iid" mtime="1247751374" schema="/schemas/apps/panel/objects/bonobo_iid" type="string">
-		<stringvalue>OAFIID:GNOME_KeyboardApplet</stringvalue>
-	</entry>
-	<entry name="launcher_location" mtime="1247751374" schema="/schemas/apps/panel/objects/launcher_location"/>
-	<entry name="menu_path" mtime="1247751374" schema="/schemas/apps/panel/objects/menu_path"/>
-</gconf>