Merge branch 'master' into altlinux-office-server

branding.spec

@@ -19,7 +19,7 @@ BuildRequires(pre): libqt4-core
 BuildRequires: libalternatives-devel
 BuildRequires: libqt4-devel
 
-BuildRequires: ImageMagick fontconfig bc
+BuildRequires: ImageMagick fontconfig bc libGConf-devel
 
 %define variants altlinux-office-desktop altlinux-desktop altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
 
@@ -208,6 +208,36 @@ touch %buildroot%_indexhtmldir/index.html
 install -m644 indexhtml.desktop %buildroot%_desktopdir/
 popd
 
+#xfce-settings
+pushd xfce-settings
+mkdir -p %buildroot/etc/skel/.config/xfce4/desktop
+mkdir -p %buildroot/etc/skel/.config/xfce4/mcs_settings
+mkdir -p %buildroot/etc/skel/.config/xfce4/panel
+mkdir -p %buildroot/etc/skel/.config/xfce4-session
+mkdir -p %buildroot/etc/skel/.config/autostart
+mkdir -p %buildroot/etc/skel/.local/share/applications
+mkdir -p %buildroot/etc/skel/Templates
+install -m 644 etcskel/Templates/* %buildroot/etc/skel/Templates/
+install -m 644 etcskel/.config/xfce4/helpers.rc %buildroot/etc/skel/.config/xfce4/
+install -m 644 etcskel/.config/xfce4/desktop/* %buildroot/etc/skel/.config/xfce4/desktop
+install -m 644 etcskel/.config/xfce4/mcs_settings/* %buildroot/etc/skel/.config/xfce4/mcs_settings
+install -m 644 etcskel/.config/xfce4/panel/* %buildroot/etc/skel/.config/xfce4/panel
+install -m 644 etcskel/.config/xfce4-session/* %buildroot/etc/skel/.config/xfce4-session/
+install -m 644 etcskel/.config/autostart/*  %buildroot/etc/skel/.config/autostart
+install -m 644 etcskel/.local/share/applications/*  %buildroot/etc/skel/.local/share/applications
+install -m 644 etcskel/.wm-select %buildroot/etc/skel/
+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/'
+
+mkdir -p %buildroot/%_bindir
+install -m 644 bin/* %buildroot/%_bindir
+popd
+
 #bootloader
 %pre bootloader
 [ -s /boot/splash/%theme ] && rm -fr  /boot/splash/%theme ||:
@@ -272,7 +302,6 @@ echo $lang > lang
 %_indexhtmldir/*
 %_desktopdir/*
 
-
 %changelog
 * Thu Aug 13 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0.0-alt22
 - \%status set to beta

components/bootloader/gfxboot.cfg.in

@@ -90,7 +90,7 @@ bootopt.pos=263,380
 ; show welcome animation
 welcome=0
 ; beep when menu is ready
-beep=1
+beep=0
 ; main menu item shown only if iso is tagged for media check
 mediacheck=mediachk
 ; main menu items where user can't add boot options
@@ -145,7 +145,7 @@ keymap.mainmenu=0
 ; show welcome animation
 welcome=0
 ; beep when menu is ready
-beep=1
+beep=0
 ; show keymap menu as submenu in lang dialog
 keymap.submenu=0
 ; show keymap in main menu

kde4-settings/menu/desktop.menu

+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+<Menu>
+</Menu>