commit gconf2-branding

22 Oct 2008

Hello community,

here is the log from the commit of package gconf2-branding
checked in at Wed Oct 22 17:53:27 CEST 2008.


--------
New Changes file:

--- /dev/null	2008-04-22 03:09:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/gconf2-branding/gconf2-branding.changes	2008-10-17 16:31:19.000000000 +0200
@@ -0,0 +1,199 @@
+-------------------------------------------------------------------
+Fri Oct 17 15:58:36 CEST 2008 - vuntz@novell.com
+
+- Merge the openSUSE/SLED/SLES gconf2-branding packages, for
+  easier maintenance.
+- Remove use of %sles_version and do the appropriate thing so that
+  what we wanted to have in SLES/SLED and not in openSUSE happens.
+- Remove /apps/gnome-power-manager/ui/cpufreq_show change: this
+  feature was removed upstream.
+- Remove branding for volume_mute, volume_down, volume_up, eject,
+  search, email, www since upstream has the right values now.
+- Use XF86Help for the help keybinding instead of 0xf5.
+- Bump version to 2.24, since we have gconf2 2.24.
+
+-------------------------------------------------------------------
+Mon Oct  6 15:41:13 CEST 2008 - sbrabec@suse.cz
+
+- Conflict with other branding providers (FATE#304881).
+
+-------------------------------------------------------------------
+Tue Sep 30 15:43:49 CEST 2008 - sbrabec@suse.cz
+
+- Fixed directory ownership.
+
+-------------------------------------------------------------------
+Mon Sep 22 2008 - federico@novell.com 
+
+- Install GnomeOnlineHelp.desktop and SuSE.desktop in
+  /usr/share/dist/desktop-files, and set the GConf key
+  /apps/nautilus/desktop/predefined_items_dir to point to that
+  directory.  This is the new way to define .desktop items that will
+  appear in users' desktops.
+
+-------------------------------------------------------------------
+Thu Sep 18 13:06:59 CEST 2008 - rodrigo@suse.de
+
+- Moved gnome-power-manager-energy-star.patch here, adding default
+  Energy Star compliant default configuration (fate#304708)
+
+-------------------------------------------------------------------
+Wed Sep 10 12:43:18 CEST 2008 - rodrigo@novell.com
+
+- Set gnome-wm script as default window manager, so that we can
+  start compiz whenever the hardware allows (fate#304762)
+
+-------------------------------------------------------------------
+Tue Jul 22 12:12:48 CEST 2008 - vuntz@novell.com
+
+- Keep upstream default for the number of workspace (4).
+- Change panel layout to have the workspace switcher by default.
+
+-------------------------------------------------------------------
+Tue Jul 15 13:46:13 CEST 2008 - coolo@suse.de
+
+- adapt the required openSUSE version
+
+-------------------------------------------------------------------
+Tue Jun 24 18:28:45 CEST 2008 - rodrigo@suse.de
+
+- Disable ESD startup by default to avoid weird things happening
+  when running GNOME apps with root (YaST) (bnc#387052) 
+
+-------------------------------------------------------------------
+Thu May 29 16:48:58 CEST 2008 - sbrabec@suse.cz
+
+- Use Gilouche theme instead of Industrial (bnc#391865).
+
+-------------------------------------------------------------------
+Tue May 20 16:55:46 CEST 2008 - rodrigo@suse.de
+
+- Updated gnome-panel-layout.patch to re-add the mixer applet to
+  default setups, now that it uses PulseAudio's volume control 
+
+-------------------------------------------------------------------
+Tue May 13 09:46:53 CEST 2008 - vuntz@suse.de
+
+- Change the way we activate the main menu with the flag keys.
+  Instead of relying on a patch that breaks in some cases (see
+  bnc#372423), we use Super_L and Super_R in
+  /apps/metacity/global_keybindings/panel_main_menu_list
+
+-------------------------------------------------------------------
+Thu May  1 10:50:04 CEST 2008 - vuntz@suse.de
+
+- Add irc: URL handler for xchat. Fix bnc#372232.
+
+-------------------------------------------------------------------
+Tue Apr 29 23:13:55 CEST 2008 - vuntz@suse.de
+
+- Fix the path to the default background in gconf
+  (s/backgrounds/wallpapers/) 
+
+-------------------------------------------------------------------
+Tue Apr 29 17:14:22 CEST 2008 - vuntz@suse.de
+
+- Don't set the following settings (consensus reached on mailing
+  list):
+  + /apps/file-roller/listing/list_mode to "all_files"
+  + /apps/ghex2/datafont to "Courier Bold 12"
+  + /apps/ghex2/headerfont to "Courier Bold 12"
+  + /apps/stickynotes_applet/defaults/color to "#E1D54B"
+  + /apps/stickynotes_applet/settings/use_system_color to "false"
+  + /desktop/gnome/volume_manager/autoplay_cda_command to "banshee
+    --play --audio-cd %d"
+  + /desktop/gnome/volume_manager/autoburn_audio_cd_command to
+    "banshee --burn-cd %d"
+  + /desktop/gnome/volume_manager/autoipod_command to "banshee
+    --dap %h"
+  + /desktop/gnome/volume_manager/autoburn to "true"
+  + /desktop/gnome/volume_manager/autoplay_dvd to "true"
+  + /desktop/gnome/volume_manager/autoipod to "true"
+- Note that banshee will still be the default command for CD/music
+  players -- it just moved from gnome-volume-manager to nautilus
+  and some mime type magic.
+- Remove duplicate /desktop/gnome/sound/enable_esd
+- Change the default epiphany homepage to www.opensuse.org
+
+-------------------------------------------------------------------
+Wed Apr 23 16:51:16 CEST 2008 - rodrigo@suse.de
+
+- Start sound server (PulseAudio) by default (bnc#377065) 
+
+-------------------------------------------------------------------
+Mon Apr 21 17:06:17 CEST 2008 - sbrabec@suse.cz
+
+- gnome-wallpaper-openSUSE renamed to
+  desktop-data-openSUSE-extra-gnome to better reflect other package
+  names.
+- desktop-data-openSUSE-extra-gnome now supplements
+  desktop-data-openSUSE-extra.
+
+-------------------------------------------------------------------
+Thu Apr 17 16:00:45 CEST 2008 - sbrabec@suse.cz
+
+- Removed background symlinks and handle it correctly in
+  desktop-data-openSUSE.
+
+-------------------------------------------------------------------
+Wed Apr 16 18:02:45 CEST 2008 - sbrabec@suse.cz
+
+- Default background fixes (bnc#369924):
+  * Use wallpaper file from desktop-data-openSUSE.
+  * New optional dynamic wallpaper in gnome-wallpaper-openSUSE
+    package.
+  * Symliked all desktop-data-openSUSE wallpapers for convenience.
+
+-------------------------------------------------------------------
+Mon Apr 14 20:57:15 CEST 2008 - mrueckert@suse.de
+
+- dont require packages just for the directory ownership.
+
+-------------------------------------------------------------------
+Mon Apr 14 19:01:41 CEST 2008 - sbrabec@suse.cz
+
+- Added openSUSE 11.0 GNOME splash (bnc#361234).
+- Added openSUSE 11.0 default background (bnc#369924).
+- Use packageand form of branding supplement.
+
+-------------------------------------------------------------------
+Wed Apr  9 14:36:45 CEST 2008 - sbrabec@suse.cz
+
+- Added COPYING file (bnc#369961).
+
+-------------------------------------------------------------------
+Mon Apr  7 13:36:12 CEST 2008 - sbrabec@suse.cz
+
+- Require gtk2-theme-openSUSE containing Metacity theme Gilouche.
+
+-------------------------------------------------------------------
+Tue Apr  1 14:18:11 CEST 2008 - vuntz@suse.de
+
+- Don't turn on metacity compositing manager by default. It might
+  not work well for everybody, so stay with upstream default for
+  now (ie, disabled by default).
+
+-------------------------------------------------------------------
+Thu Mar 20 13:25:32 CET 2008 - sbrabec@suse.cz
+
+- Fixed windows keys settings: On for SLED, Off for openSUSE.
+
+-------------------------------------------------------------------
+Wed Mar 19 12:40:06 CET 2008 - rodrigo@suse.de
+
+- Removed mixer applet from default panel configuration. 
+
+-------------------------------------------------------------------
+Fri Mar 14 13:36:52 CET 2008 - sbrabec@suse.cz
+
+- Disable movement moved from gnome-panel to branding.
+- Clean up of default configuration.
+
+-------------------------------------------------------------------
+Thu Mar 13 18:57:22 CET 2008 - sbrabec@suse.cz
+
+- New SuSE package, collects all gconf vendor defaults
+  (fate#301464, fate#301792).
+- Included gnome-session-branding-openSUSE.
++++ 2 more lines (skipped)
++++ between /dev/null
++++ and /mounts/work_src_done/STABLE/gconf2-branding/gconf2-branding.changes
New Changes file:

gconf2-branding-openSUSE.changes: same change
New Changes file:

gconf2-branding-SLED.changes: same change
New Changes file:

gconf2-branding-SLES.changes: same change

calling whatdependson for head-i586


New:
----
  gconf2-branding.changes
  gconf2-branding-COPYING
  gconf2-branding-gnome-splash.png
  gconf2-branding-openSUSE.changes
  gconf2-branding-openSUSE.spec
  gconf2-branding-SLED.changes
  gconf2-branding-SLED.spec
  gconf2-branding-SLES.changes
  gconf2-branding-SLES.spec
  gconf2-branding.spec.in
  gconf2-branding_spec-prepare.sh
  GnomeOnlineHelp.desktop
  gnome-panel-layout.patch
  gnome-panel-layout-SLES.patch
  gnome-wallpaper-11.0.1.tar.bz2
  panel-default-setup.entries
  pre_checkin.sh
  SuSE.desktop

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gconf2-branding-openSUSE.spec ++++++
#
# spec file for package gconf2-branding-openSUSE (Version 2.24)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

# norootforbuild

%define         build_openSUSE 1
%define         build_SLED 0
%define         build_SLES 0
%if %build_openSUSE
%define         branding_name openSUSE
%define         desktop_data  openSUSE
%endif
%if %build_SLED
%define         branding_name SLED
%define         desktop_data  SLED
%endif
%if %build_SLES
%define         branding_name SLES
%define         desktop_data  SLED
%endif
# Do not edit this auto generated file! Edit gconf2-branding.spec.in.

Name:           gconf2-branding-openSUSE
License:        BSD 3-Clause
Group:          System/GUI/GNOME
Summary:        GNOME configuration system: openSUSE defaults
Version:        2.24
Release:        2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
Source:         gconf2-branding_spec-prepare.sh
Source1:        gconf2-branding-gnome-splash.png
# panel-default-setup.entries from gnome-panel (patched SuSE version):
Source2:        panel-default-setup.entries
Source3:        gconf2-branding-COPYING
Source4:        gnome-wallpaper-11.0.1.tar.bz2
Source5:        GnomeOnlineHelp.desktop
Source6:        SuSE.desktop
# PATCH-FEATURE-OPENSUSE gnome-panel-layout.patch -- panel-default-setup.entries patch for gnome-panel:
Patch0:         gnome-panel-layout.patch
# PATCH-FEATURE-OPENSUSE gnome-panel-layout-SLES.patch -- panel-default-setup.entries patch for gnome-panel:
Patch1:         gnome-panel-layout-SLES.patch
Provides:       gconf2-branding = 2.20
Conflicts:      otherproviders(gconf2-branding)
Supplements:    packageand(branding-openSUSE:gconf2)
# This package provides openSUSE gnome-session splash:
Provides:       gnome-session-branding = 2.20
Provides:       gnome-session-branding-openSUSE = 2.20
Supplements:    packageand(branding-openSUSE:gnome-session)
BuildRequires:  desktop-data-%{desktop_data} gconf2
# For directory ownership of %{_datadir}/pixmaps/splash:
# BuildRequires:  gnome-session
# For directory ownership of %{_datadir}/backgrounds:
# BuildRequires:  gnome-themes
#BRAND: gconf2-branding-openSUSE provides branding Look and Feel using
#BRAND: gconf schemas. All referenced files must be present in this
#BRAND: package or in required packages.
# Referenced Metacity theme Gilouche is part of gtk2-theme-openSUSE:
Requires:       gtk2-theme-%{desktop_data} desktop-data-%{desktop_data} = 11.1
Suggests:       desktop-data-openSUSE-extra-gnome

%description
This package provides openSUSE defaults for configurations based on
GConf database system.



%package -n desktop-data-openSUSE-extra-gnome
License:        BSD 3-Clause
Enhances:       gconf2-branding-openSUSE
Supplements:    desktop-data-%{desktop_data}-extra
Summary:        Dynamic Wallpaper with openSUSE Look
Group:          System/GUI/GNOME
Version:        11.0.1
Release:        74

%description -n desktop-data-openSUSE-extra-gnome
This optional package contains nice dynamic wallpaper with openSUSE
look.

It changes its color depending on day time - bright in daylight, dark
overnight.



Authors:
--------
    Jakub Steiner 

%prep
%setup -q -T -a4 -c %{name}-%{version}
cp -a %{S:1} gnome-splash-openSUSE.png
cp -a %{S:2} .
cp -a %{S:3} COPYING
%if %build_openSUSE || %build_SLED
%patch
%endif
%if %build_SLES
%patch1
%endif

%build
mkdir -p grass
cp -a *-grass-*.png grass.xml grass

%install
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
install -m0644 gnome-splash-openSUSE.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/
cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra-gnome.xml
# http://en.opensuse.org/GNOME/Projects/SchemasChanges
# Only vendor preferences are allowed here.
# Stuff to "Make OpenSUSE working must remain in particular packages!
%define gconf_call gconftool-2 --direct --config-source=xml::$RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
%define gconf_set %gconf_call --set
%define gconf_load %gconf_call --load
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
# Set actions list differently from upstream:
# FIXME: NEEDS-REBASE
#%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Add Printer;gnome-cups-manager.desktop,Configure Network;YaST2/lan.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]"
# Change epiphany homepage:
%if %build_openSUSE
%gconf_set /apps/epiphany/general/homepage --type=string "http://www.opensuse.org/"
%endif
%if %build_SLED || %build_SLES
%gconf_set /apps/epiphany/general/homepage --type=string "http://www.novell.com/linux/"
%endif
# Globally disable movement of predefined panels in gnome-panel:
%gconf_set /apps/panel/global/disable_movement --type=bool "true"
# Display all workspaces in the gnome-panel window list applet:
# FIXME: This key has no applyto and it cannot work. But it is now the default.
#%gconf_set /schemas/apps/window_list_applet/prefs/display_all_workspaces --type=bool "true"
# Enable Energy Star compliant default configuration
%gconf_set /apps/gnome-power-manager/actions/sleep_type_battery --type=string "suspend"
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200
%gconf_set /apps/gnome-power-manager/timeout/sleep_display_ac --type=int 300
# Use custom splash screen in gnome-session:
%gconf_set /apps/gnome-session/options/splash_image --type=string "%{_datadir}/pixmaps/splash/gnome-splash-openSUSE.png"
# Use gnome-wm as default window manager:
%gconf_set /desktop/gnome/session/required_components/windowmanager --type=string "gnome-wm"
# Define default keybinding of gnome-settings-daemon:
# FIX-OPENSUSE gnome-settings-daemon-default-config.patch
%gconf_set /apps/gnome_settings_daemon/keybindings/help --type=string "XF86Help"
# Do not show process 'estimated memory usage' column on startup:
# FIX-UPSTREAM gnome-system-monitor-resident-schema.patch bnc157022 bgo336376 joeshaw@novell.com -- Probably need to really show Resident by default
%gconf_set /apps/procman/proctree/col_15_visible --type=bool "FALSE"
%gconf_set /apps/gnome-terminal/global/use_mnemonics --type=bool "false"
%gconf_set /apps/gnome-terminal/global/use_menu_accelerators --type=bool "false"
# Use firefox, not epiphany for all apps handled by gnome-vfs2 and libgnome (keep inactive for ftp):
%gconf_set /desktop/gnome/url-handlers/http/command --type=string "firefox %s"
%gconf_set /desktop/gnome/url-handlers/https/command --type=string "firefox %s"
%gconf_set /desktop/gnome/url-handlers/ftp/command --type=string "firefox %s"
%gconf_set /desktop/gnome/applications/browser/exec --type=string "firefox"
# Use xchat for irc
%gconf_set /desktop/gnome/url-handlers/irc/command --type=string "xchat --existing --url=%s"
%gconf_set /desktop/gnome/url-handlers/irc/enabled --type=bool "true"
# Prefer OpenSUSE applications in gnome-volume-manager:
%gconf_set /desktop/gnome/volume_manager/autophoto_command --type=string "f-spot-import %h"
%gconf_set /desktop/gnome/volume_manager/autoprinter_command --type=string "add-unknown-printer %h"
%gconf_set /desktop/gnome/volume_manager/autovideocam_command --type=string "kino %d"
# Auto run photo management command:
%gconf_set /desktop/gnome/volume_manager/autophoto --type=bool "true"
# Auto run scanner program
%gconf_set /desktop/gnome/volume_manager/autoscanner --type=bool "true"
# Auto run video editing program
%gconf_set /desktop/gnome/volume_manager/autovideocam --type=bool "true"
# Change default look of GNOME in libgnome:
# Change default background (scriptlets may alter this value):
%if %build_openSUSE
test -f %{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png
# WARNING: Don't forget to change value in scriptlets below:
%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png"
%endif
%if %build_SLED || %build_SLES
test -f %{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg
# WARNING: Don't forget to change value in scriptlets below:
%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg"
%endif
%gconf_set /desktop/gnome/background/picture_options --type=string "stretched"
%gconf_set /desktop/gnome/background/primary_color --type=string "#258c06"
%gconf_set /desktop/gnome/background/secondary_color --type=string "#258c06"
%gconf_set /desktop/gnome/file_views/icon_theme --type=string "Gilouche"
%gconf_set /desktop/gnome/interface/accessibility --type=bool "false"
%gconf_set /desktop/gnome/interface/icon_theme --type=string "Gilouche"
# WARNING: gtk2-branding-openSUSE must contain the same, otherwise it
# will change when gnome-settings-daemon starts:
%gconf_set /desktop/gnome/interface/gtk_theme --type=string "Gilouche"
# Enable sound events by default in libgnome:
%gconf_set /desktop/gnome/sound/enable_esd --type=bool "false"
%gconf_set /desktop/gnome/sound/event_sounds --type=bool "true"
# Disable audible bell in metacity:
%gconf_set /apps/metacity/general/audible_bell --type=bool "false"
%if %build_SLED || %build_SLES
# Enable Windows flag keys to show the panel's main menu in SLED:
%gconf_set /apps/metacity/global_keybindings/panel_main_menu_list --type=list --list-type=string "[Super_L,Super_R]"
%endif
# Change default theme in Metacity:
%gconf_set /apps/metacity/general/theme --type=string "Gilouche"
# FIX-OPENSUSE nautilus-config-defaults.patch -- Default configuration
# Enables the classic Nautilus behavior, where all windows are browsers:
%gconf_set /apps/nautilus/preferences/always_use_browser --type=bool "true"
# Never preview sounds when mousing over an icon:
%gconf_set /apps/nautilus/preferences/preview_sound --type=string "never"
# Computer icon invisible on desktop:
%gconf_set /apps/nautilus/desktop/computer_icon_visible --type=bool "false"
# Change notification-daemon theme used when displaying notifications:
%gconf_set /apps/notification-daemon/theme --type=string "bubble"
#
# And generate default GNOME panel layout:
export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
%gconf_load panel-default-setup.entries
#
# Merge is optional, but one larger file is better than many small files:
gconf-merge-tree $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/*/*
rmdir $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/* 2>/dev/null || :
# This is deliberately done after the merge. We may want to modify it in scriptlets.
#
# Set up .desktop files to be shown in users' desktops
%gconf_set /apps/nautilus/desktop/predefined_items_dir --type=string /usr/share/dist/desktop-files
install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files
install -m 0644 %{S:5} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/
install -m 0644 %{S:6} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/

%clean
rm -rf $RPM_BUILD_ROOT

%triggerin -- desktop-data-openSUSE-extra-gnome
# If desktop-data-openSUSE-extra-gnome exists, we want nice dynamic background.
gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
    /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/grass/grass.xml"

%triggerpostun -- desktop-data-openSUSE-extra-gnome
# If desktop-data-openSUSE-extra-gnome exists, we want nice dynamic background.
if ! test -f %{_datadir}/backgrounds/grass/grass.xml ; then
%if %build_openSUSE
  gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
    /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png"
%endif
%if %build_SLED || %build_SLES
  gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
    /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg"
%endif
fi

%post
# If desktop-data-openSUSE-extra-gnome exists, we want nice dynamic background.
if test -f %{_datadir}/backgrounds/grass/grass.xml ; then
  gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
    /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/grass/grass.xml"
fi

%files
%defattr(-,root,root)
%doc COPYING
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
%dir %{_datadir}/pixmaps/splash
%{_datadir}/pixmaps/splash/gnome-splash-openSUSE.png
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/dist
%dir %{_datadir}/dist/desktop-files
%{_datadir}/dist/desktop-files/*

%files -n desktop-data-openSUSE-extra-gnome
%defattr(-,root,root)
%doc COPYING
%{_datadir}/backgrounds/grass
%{_datadir}/gnome-background-properties/desktop-data-openSUSE-extra-gnome.xml
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/gnome-background-properties

%changelog
* Fri Oct 17 2008 vuntz@novell.com
- Merge the openSUSE/SLED/SLES gconf2-branding packages, for
  easier maintenance.
- Remove use of %%sles_version and do the appropriate thing so that
  what we wanted to have in SLES/SLED and not in openSUSE happens.
- Remove /apps/gnome-power-manager/ui/cpufreq_show change: this
  feature was removed upstream.
- Remove branding for volume_mute, volume_down, volume_up, eject,
  search, email, www since upstream has the right values now.
- Use XF86Help for the help keybinding instead of 0xf5.
- Bump version to 2.24, since we have gconf2 2.24.
* Mon Oct 06 2008 sbrabec@suse.cz
- Conflict with other branding providers (FATE#304881).
* Tue Sep 30 2008 sbrabec@suse.cz
- Fixed directory ownership.
* Mon Sep 22 2008 federico@novell.com 
- Install GnomeOnlineHelp.desktop and SuSE.desktop in
  /usr/share/dist/desktop-files, and set the GConf key
  /apps/nautilus/desktop/predefined_items_dir to point to that
  directory.  This is the new way to define .desktop items that will
  appear in users' desktops.
* Thu Sep 18 2008 rodrigo@suse.de
- Moved gnome-power-manager-energy-star.patch here, adding default
  Energy Star compliant default configuration (fate#304708)
* Wed Sep 10 2008 rodrigo@novell.com
- Set gnome-wm script as default window manager, so that we can
  start compiz whenever the hardware allows (fate#304762)
* Tue Jul 22 2008 vuntz@novell.com
- Keep upstream default for the number of workspace (4).
- Change panel layout to have the workspace switcher by default.
* Tue Jul 15 2008 coolo@suse.de
- adapt the required openSUSE version
* Tue Jun 24 2008 rodrigo@suse.de
- Disable ESD startup by default to avoid weird things happening
  when running GNOME apps with root (YaST) (bnc#387052)
* Thu May 29 2008 sbrabec@suse.cz
- Use Gilouche theme instead of Industrial (bnc#391865).
* Tue May 20 2008 rodrigo@suse.de
- Updated gnome-panel-layout.patch to re-add the mixer applet to
  default setups, now that it uses PulseAudio's volume control
* Tue May 13 2008 vuntz@suse.de
- Change the way we activate the main menu with the flag keys.
  Instead of relying on a patch that breaks in some cases (see
  bnc#372423), we use Super_L and Super_R in
  /apps/metacity/global_keybindings/panel_main_menu_list
* Thu May 01 2008 vuntz@suse.de
- Add irc: URL handler for xchat. Fix bnc#372232.
* Wed Apr 30 2008 vuntz@suse.de
- Fix the path to the default background in gconf
  (s/backgrounds/wallpapers/)
* Tue Apr 29 2008 vuntz@suse.de
- Don't set the following settings (consensus reached on mailing
  list):
  + /apps/file-roller/listing/list_mode to "all_files"
  + /apps/ghex2/datafont to "Courier Bold 12"
  + /apps/ghex2/headerfont to "Courier Bold 12"
  + /apps/stickynotes_applet/defaults/color to "#E1D54B"
  + /apps/stickynotes_applet/settings/use_system_color to "false"
  + /desktop/gnome/volume_manager/autoplay_cda_command to "banshee
    --play --audio-cd %%d"
  + /desktop/gnome/volume_manager/autoburn_audio_cd_command to
  "banshee --burn-cd %%d"
  + /desktop/gnome/volume_manager/autoipod_command to "banshee
    --dap %%h"
  + /desktop/gnome/volume_manager/autoburn to "true"
  + /desktop/gnome/volume_manager/autoplay_dvd to "true"
  + /desktop/gnome/volume_manager/autoipod to "true"
- Note that banshee will still be the default command for CD/music
  players -- it just moved from gnome-volume-manager to nautilus
  and some mime type magic.
- Remove duplicate /desktop/gnome/sound/enable_esd
- Change the default epiphany homepage to www.opensuse.org
* Wed Apr 23 2008 rodrigo@suse.de
- Start sound server (PulseAudio) by default (bnc#377065)
* Mon Apr 21 2008 sbrabec@suse.cz
- gnome-wallpaper-openSUSE renamed to
  desktop-data-openSUSE-extra-gnome to better reflect other package
  names.
- desktop-data-openSUSE-extra-gnome now supplements
  desktop-data-openSUSE-extra.
* Thu Apr 17 2008 sbrabec@suse.cz
- Removed background symlinks and handle it correctly in
  desktop-data-openSUSE.
* Wed Apr 16 2008 sbrabec@suse.cz
- Default background fixes (bnc#369924):
  * Use wallpaper file from desktop-data-openSUSE.
  * New optional dynamic wallpaper in gnome-wallpaper-openSUSE
  package.
  * Symliked all desktop-data-openSUSE wallpapers for convenience.
* Mon Apr 14 2008 mrueckert@suse.de
- dont require packages just for the directory ownership.
* Mon Apr 14 2008 sbrabec@suse.cz
- Added openSUSE 11.0 GNOME splash (bnc#361234).
- Added openSUSE 11.0 default background (bnc#369924).
- Use packageand form of branding supplement.
* Wed Apr 09 2008 sbrabec@suse.cz
- Added COPYING file (bnc#369961).
* Mon Apr 07 2008 sbrabec@suse.cz
- Require gtk2-theme-openSUSE containing Metacity theme Gilouche.
* Tue Apr 01 2008 vuntz@suse.de
- Don't turn on metacity compositing manager by default. It might
  not work well for everybody, so stay with upstream default for
  now (ie, disabled by default).
* Thu Mar 20 2008 sbrabec@suse.cz
- Fixed windows keys settings: On for SLED, Off for openSUSE.
* Wed Mar 19 2008 rodrigo@suse.de
- Removed mixer applet from default panel configuration.
* Fri Mar 14 2008 sbrabec@suse.cz
- Disable movement moved from gnome-panel to branding.
- Clean up of default configuration.
* Thu Mar 13 2008 sbrabec@suse.cz
- New SuSE package, collects all gconf vendor defaults
  (fate#301464, fate#301792).
- Included gnome-session-branding-openSUSE.
- Included default GNOME panel configuration (fate#301474).
++++++ gconf2-branding-SLED.spec ++++++
#
# spec file for package gconf2-branding-SLED (Version 2.24)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

# norootforbuild

%define         build_openSUSE 0
%define         build_SLED 1
%define         build_SLES 0
%if %build_openSUSE
%define         branding_name openSUSE
%define         desktop_data  openSUSE
%endif
%if %build_SLED
%define         branding_name SLED
%define         desktop_data  SLED
%endif
%if %build_SLES
%define         branding_name SLES
%define         desktop_data  SLED
%endif
# Do not edit this auto generated file! Edit gconf2-branding.spec.in.

Name:           gconf2-branding-SLED
License:        BSD 3-Clause
Group:          System/GUI/GNOME
Summary:        SLED defaults for the GNOME configuration system
Version:        2.24
Release:        2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
Source:         gconf2-branding_spec-prepare.sh
Source1:        gconf2-branding-gnome-splash.png
# panel-default-setup.entries from gnome-panel (patched SuSE version):
Source2:        panel-default-setup.entries
Source3:        gconf2-branding-COPYING
Source4:        gnome-wallpaper-11.0.1.tar.bz2
Source5:        GnomeOnlineHelp.desktop
Source6:        SuSE.desktop
# PATCH-FEATURE-OPENSUSE gnome-panel-layout.patch -- panel-default-setup.entries patch for gnome-panel:
Patch0:         gnome-panel-layout.patch
# PATCH-FEATURE-OPENSUSE gnome-panel-layout-SLES.patch -- panel-default-setup.entries patch for gnome-panel:
Patch1:         gnome-panel-layout-SLES.patch
Provides:       gconf2-branding = 2.20
Conflicts:      otherproviders(gconf2-branding)
Supplements:    packageand(branding-SLED:gconf2)
# This package provides openSUSE gnome-session splash:
Provides:       gnome-session-branding = 2.20
Provides:       gnome-session-branding-SLED = 2.20
Supplements:    packageand(branding-SLED:gnome-session)
BuildRequires:  desktop-data-%{desktop_data} gconf2
# For directory ownership of %{_datadir}/pixmaps/splash:
# BuildRequires:  gnome-session
# For directory ownership of %{_datadir}/backgrounds:
# BuildRequires:  gnome-themes
#BRAND: gconf2-branding-openSUSE provides branding Look and Feel using
#BRAND: gconf schemas. All referenced files must be present in this
#BRAND: package or in required packages.
# Referenced Metacity theme Gilouche is part of gtk2-theme-openSUSE:
Requires:       gtk2-theme-%{desktop_data} desktop-data-%{desktop_data} = 11.1
Suggests:       desktop-data-SLED-extra-gnome

%description
This package provides SLED defaults for configurations based on GConf
database system.



%package -n desktop-data-SLED-extra-gnome
License:        BSD 3-Clause
Enhances:       gconf2-branding-SLED
Supplements:    desktop-data-%{desktop_data}-extra
Summary:        SLED defaults for the GNOME configuration system
Group:          System/GUI/GNOME
Version:        11.0.1
Release:        14

%description -n desktop-data-SLED-extra-gnome
This package provides SLED defaults for configurations based on GConf
database system.



%prep
%setup -q -T -a4 -c %{name}-%{version}
cp -a %{S:1} gnome-splash-SLED.png
cp -a %{S:2} .
cp -a %{S:3} COPYING
%if %build_openSUSE || %build_SLED
%patch
%endif
%if %build_SLES
%patch1
%endif

%build
mkdir -p grass
cp -a *-grass-*.png grass.xml grass

%install
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
install -m0644 gnome-splash-SLED.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/
cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLED-extra-gnome.xml
# http://en.opensuse.org/GNOME/Projects/SchemasChanges
# Only vendor preferences are allowed here.
# Stuff to "Make OpenSUSE working must remain in particular packages!
%define gconf_call gconftool-2 --direct --config-source=xml::$RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
%define gconf_set %gconf_call --set
%define gconf_load %gconf_call --load
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
# Set actions list differently from upstream:
# FIXME: NEEDS-REBASE
#%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Add Printer;gnome-cups-manager.desktop,Configure Network;YaST2/lan.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]"
# Change epiphany homepage:
%if %build_openSUSE
%gconf_set /apps/epiphany/general/homepage --type=string "http://www.opensuse.org/"
%endif
%if %build_SLED || %build_SLES
%gconf_set /apps/epiphany/general/homepage --type=string "http://www.novell.com/linux/"
%endif
# Globally disable movement of predefined panels in gnome-panel:
%gconf_set /apps/panel/global/disable_movement --type=bool "true"
# Display all workspaces in the gnome-panel window list applet:
# FIXME: This key has no applyto and it cannot work. But it is now the default.
#%gconf_set /schemas/apps/window_list_applet/prefs/display_all_workspaces --type=bool "true"
# Enable Energy Star compliant default configuration
%gconf_set /apps/gnome-power-manager/actions/sleep_type_battery --type=string "suspend"
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200
%gconf_set /apps/gnome-power-manager/timeout/sleep_display_ac --type=int 300
# Use custom splash screen in gnome-session:
%gconf_set /apps/gnome-session/options/splash_image --type=string "%{_datadir}/pixmaps/splash/gnome-splash-SLED.png"
# Use gnome-wm as default window manager:
%gconf_set /desktop/gnome/session/required_components/windowmanager --type=string "gnome-wm"
# Define default keybinding of gnome-settings-daemon:
# FIX-OPENSUSE gnome-settings-daemon-default-config.patch
%gconf_set /apps/gnome_settings_daemon/keybindings/help --type=string "XF86Help"
# Do not show process 'estimated memory usage' column on startup:
# FIX-UPSTREAM gnome-system-monitor-resident-schema.patch bnc157022 bgo336376 joeshaw@novell.com -- Probably need to really show Resident by default
%gconf_set /apps/procman/proctree/col_15_visible --type=bool "FALSE"
%gconf_set /apps/gnome-terminal/global/use_mnemonics --type=bool "false"
%gconf_set /apps/gnome-terminal/global/use_menu_accelerators --type=bool "false"
# Use firefox, not epiphany for all apps handled by gnome-vfs2 and libgnome (keep inactive for ftp):
%gconf_set /desktop/gnome/url-handlers/http/command --type=string "firefox %s"
%gconf_set /desktop/gnome/url-handlers/https/command --type=string "firefox %s"
%gconf_set /desktop/gnome/url-handlers/ftp/command --type=string "firefox %s"
%gconf_set /desktop/gnome/applications/browser/exec --type=string "firefox"
# Use xchat for irc
%gconf_set /desktop/gnome/url-handlers/irc/command --type=string "xchat --existing --url=%s"
%gconf_set /desktop/gnome/url-handlers/irc/enabled --type=bool "true"
# Prefer OpenSUSE applications in gnome-volume-manager:
%gconf_set /desktop/gnome/volume_manager/autophoto_command --type=string "f-spot-import %h"
%gconf_set /desktop/gnome/volume_manager/autoprinter_command --type=string "add-unknown-printer %h"
%gconf_set /desktop/gnome/volume_manager/autovideocam_command --type=string "kino %d"
# Auto run photo management command:
%gconf_set /desktop/gnome/volume_manager/autophoto --type=bool "true"
# Auto run scanner program
%gconf_set /desktop/gnome/volume_manager/autoscanner --type=bool "true"
# Auto run video editing program
%gconf_set /desktop/gnome/volume_manager/autovideocam --type=bool "true"
# Change default look of GNOME in libgnome:
# Change default background (scriptlets may alter this value):
%if %build_openSUSE
test -f %{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png
# WARNING: Don't forget to change value in scriptlets below:
%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png"
%endif
%if %build_SLED || %build_SLES
test -f %{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg
# WARNING: Don't forget to change value in scriptlets below:
%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg"
%endif
%gconf_set /desktop/gnome/background/picture_options --type=string "stretched"
%gconf_set /desktop/gnome/background/primary_color --type=string "#258c06"
%gconf_set /desktop/gnome/background/secondary_color --type=string "#258c06"
%gconf_set /desktop/gnome/file_views/icon_theme --type=string "Gilouche"
%gconf_set /desktop/gnome/interface/accessibility --type=bool "false"
%gconf_set /desktop/gnome/interface/icon_theme --type=string "Gilouche"
# WARNING: gtk2-branding-SLED must contain the same, otherwise it
# will change when gnome-settings-daemon starts:
%gconf_set /desktop/gnome/interface/gtk_theme --type=string "Gilouche"
# Enable sound events by default in libgnome:
%gconf_set /desktop/gnome/sound/enable_esd --type=bool "false"
%gconf_set /desktop/gnome/sound/event_sounds --type=bool "true"
# Disable audible bell in metacity:
%gconf_set /apps/metacity/general/audible_bell --type=bool "false"
%if %build_SLED || %build_SLES
# Enable Windows flag keys to show the panel's main menu in SLED:
%gconf_set /apps/metacity/global_keybindings/panel_main_menu_list --type=list --list-type=string "[Super_L,Super_R]"
%endif
# Change default theme in Metacity:
%gconf_set /apps/metacity/general/theme --type=string "Gilouche"
# FIX-OPENSUSE nautilus-config-defaults.patch -- Default configuration
# Enables the classic Nautilus behavior, where all windows are browsers:
%gconf_set /apps/nautilus/preferences/always_use_browser --type=bool "true"
# Never preview sounds when mousing over an icon:
%gconf_set /apps/nautilus/preferences/preview_sound --type=string "never"
# Computer icon invisible on desktop:
%gconf_set /apps/nautilus/desktop/computer_icon_visible --type=bool "false"
# Change notification-daemon theme used when displaying notifications:
%gconf_set /apps/notification-daemon/theme --type=string "bubble"
#
# And generate default GNOME panel layout:
export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
%gconf_load panel-default-setup.entries
#
# Merge is optional, but one larger file is better than many small files:
gconf-merge-tree $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/*/*
rmdir $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/* 2>/dev/null || :
# This is deliberately done after the merge. We may want to modify it in scriptlets.
#
# Set up .desktop files to be shown in users' desktops
%gconf_set /apps/nautilus/desktop/predefined_items_dir --type=string /usr/share/dist/desktop-files
install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files
install -m 0644 %{S:5} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/
install -m 0644 %{S:6} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/

%clean
rm -rf $RPM_BUILD_ROOT

%triggerin -- desktop-data-SLED-extra-gnome
# If desktop-data-SLED-extra-gnome exists, we want nice dynamic background.
gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
    /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/grass/grass.xml"

%triggerpostun -- desktop-data-SLED-extra-gnome
# If desktop-data-SLED-extra-gnome exists, we want nice dynamic background.
if ! test -f %{_datadir}/backgrounds/grass/grass.xml ; then
%if %build_openSUSE
  gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
    /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png"
%endif
%if %build_SLED || %build_SLES
  gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
    /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg"
%endif
fi

%post
# If desktop-data-SLED-extra-gnome exists, we want nice dynamic background.
if test -f %{_datadir}/backgrounds/grass/grass.xml ; then
  gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
    /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/grass/grass.xml"
fi

%files
%defattr(-,root,root)
%doc COPYING
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
%dir %{_datadir}/pixmaps/splash
%{_datadir}/pixmaps/splash/gnome-splash-SLED.png
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/dist
%dir %{_datadir}/dist/desktop-files
%{_datadir}/dist/desktop-files/*

%files -n desktop-data-SLED-extra-gnome
%defattr(-,root,root)
%doc COPYING
%{_datadir}/backgrounds/grass
%{_datadir}/gnome-background-properties/desktop-data-SLED-extra-gnome.xml
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/gnome-background-properties

%changelog
* Fri Oct 17 2008 vuntz@novell.com
- Merge the openSUSE/SLED/SLES gconf2-branding packages, for
  easier maintenance.
- Remove use of %%sles_version and do the appropriate thing so that
  what we wanted to have in SLES/SLED and not in openSUSE happens.
- Remove /apps/gnome-power-manager/ui/cpufreq_show change: this
  feature was removed upstream.
- Remove branding for volume_mute, volume_down, volume_up, eject,
  search, email, www since upstream has the right values now.
- Use XF86Help for the help keybinding instead of 0xf5.
- Bump version to 2.24, since we have gconf2 2.24.
* Mon Oct 06 2008 sbrabec@suse.cz
- Conflict with other branding providers (FATE#304881).
* Tue Sep 30 2008 sbrabec@suse.cz
- Fixed directory ownership.
* Mon Sep 22 2008 federico@novell.com 
- Install GnomeOnlineHelp.desktop and SuSE.desktop in
  /usr/share/dist/desktop-files, and set the GConf key
  /apps/nautilus/desktop/predefined_items_dir to point to that
  directory.  This is the new way to define .desktop items that will
  appear in users' desktops.
* Thu Sep 18 2008 rodrigo@suse.de
- Moved gnome-power-manager-energy-star.patch here, adding default
  Energy Star compliant default configuration (fate#304708)
* Wed Sep 10 2008 rodrigo@novell.com
- Set gnome-wm script as default window manager, so that we can
  start compiz whenever the hardware allows (fate#304762)
* Tue Jul 22 2008 vuntz@novell.com
- Keep upstream default for the number of workspace (4).
- Change panel layout to have the workspace switcher by default.
* Tue Jul 15 2008 coolo@suse.de
- adapt the required openSUSE version
* Tue Jun 24 2008 rodrigo@suse.de
- Disable ESD startup by default to avoid weird things happening
  when running GNOME apps with root (YaST) (bnc#387052)
* Thu May 29 2008 sbrabec@suse.cz
- Use Gilouche theme instead of Industrial (bnc#391865).
* Tue May 20 2008 rodrigo@suse.de
- Updated gnome-panel-layout.patch to re-add the mixer applet to
  default setups, now that it uses PulseAudio's volume control
* Tue May 13 2008 vuntz@suse.de
- Change the way we activate the main menu with the flag keys.
  Instead of relying on a patch that breaks in some cases (see
  bnc#372423), we use Super_L and Super_R in
  /apps/metacity/global_keybindings/panel_main_menu_list
* Thu May 01 2008 vuntz@suse.de
- Add irc: URL handler for xchat. Fix bnc#372232.
* Wed Apr 30 2008 vuntz@suse.de
- Fix the path to the default background in gconf
  (s/backgrounds/wallpapers/)
* Tue Apr 29 2008 vuntz@suse.de
- Don't set the following settings (consensus reached on mailing
  list):
  + /apps/file-roller/listing/list_mode to "all_files"
  + /apps/ghex2/datafont to "Courier Bold 12"
  + /apps/ghex2/headerfont to "Courier Bold 12"
  + /apps/stickynotes_applet/defaults/color to "#E1D54B"
  + /apps/stickynotes_applet/settings/use_system_color to "false"
  + /desktop/gnome/volume_manager/autoplay_cda_command to "banshee
    --play --audio-cd %%d"
  + /desktop/gnome/volume_manager/autoburn_audio_cd_command to
  "banshee --burn-cd %%d"
  + /desktop/gnome/volume_manager/autoipod_command to "banshee
    --dap %%h"
  + /desktop/gnome/volume_manager/autoburn to "true"
  + /desktop/gnome/volume_manager/autoplay_dvd to "true"
  + /desktop/gnome/volume_manager/autoipod to "true"
- Note that banshee will still be the default command for CD/music
  players -- it just moved from gnome-volume-manager to nautilus
  and some mime type magic.
- Remove duplicate /desktop/gnome/sound/enable_esd
- Change the default epiphany homepage to www.opensuse.org
* Wed Apr 23 2008 rodrigo@suse.de
- Start sound server (PulseAudio) by default (bnc#377065)
* Mon Apr 21 2008 sbrabec@suse.cz
- gnome-wallpaper-openSUSE renamed to
  desktop-data-openSUSE-extra-gnome to better reflect other package
  names.
- desktop-data-openSUSE-extra-gnome now supplements
  desktop-data-openSUSE-extra.
* Thu Apr 17 2008 sbrabec@suse.cz
- Removed background symlinks and handle it correctly in
  desktop-data-openSUSE.
* Wed Apr 16 2008 sbrabec@suse.cz
- Default background fixes (bnc#369924):
  * Use wallpaper file from desktop-data-openSUSE.
  * New optional dynamic wallpaper in gnome-wallpaper-openSUSE
  package.
  * Symliked all desktop-data-openSUSE wallpapers for convenience.
* Mon Apr 14 2008 mrueckert@suse.de
- dont require packages just for the directory ownership.
* Mon Apr 14 2008 sbrabec@suse.cz
- Added openSUSE 11.0 GNOME splash (bnc#361234).
- Added openSUSE 11.0 default background (bnc#369924).
- Use packageand form of branding supplement.
* Wed Apr 09 2008 sbrabec@suse.cz
- Added COPYING file (bnc#369961).
* Mon Apr 07 2008 sbrabec@suse.cz
- Require gtk2-theme-openSUSE containing Metacity theme Gilouche.
* Tue Apr 01 2008 vuntz@suse.de
- Don't turn on metacity compositing manager by default. It might
  not work well for everybody, so stay with upstream default for
  now (ie, disabled by default).
* Thu Mar 20 2008 sbrabec@suse.cz
- Fixed windows keys settings: On for SLED, Off for openSUSE.
* Wed Mar 19 2008 rodrigo@suse.de
- Removed mixer applet from default panel configuration.
* Fri Mar 14 2008 sbrabec@suse.cz
- Disable movement moved from gnome-panel to branding.
- Clean up of default configuration.
* Thu Mar 13 2008 sbrabec@suse.cz
- New SuSE package, collects all gconf vendor defaults
  (fate#301464, fate#301792).
- Included gnome-session-branding-openSUSE.
- Included default GNOME panel configuration (fate#301474).
++++++ gconf2-branding-SLES.spec ++++++
#
# spec file for package gconf2-branding-SLES (Version 2.24)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.

# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

# norootforbuild

%define         build_openSUSE 0
%define         build_SLED 0
%define         build_SLES 1
%if %build_openSUSE
%define         branding_name openSUSE
%define         desktop_data  openSUSE
%endif
%if %build_SLED
%define         branding_name SLED
%define         desktop_data  SLED
%endif
%if %build_SLES
%define         branding_name SLES
%define         desktop_data  SLED
%endif
# Do not edit this auto generated file! Edit gconf2-branding.spec.in.

Name:           gconf2-branding-SLES
License:        BSD 3-Clause
Group:          System/GUI/GNOME
Summary:        SLES defaults for the GNOME configuration system
Version:        2.24
Release:        2
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-build
Source:         gconf2-branding_spec-prepare.sh
Source1:        gconf2-branding-gnome-splash.png
# panel-default-setup.entries from gnome-panel (patched SuSE version):
Source2:        panel-default-setup.entries
Source3:        gconf2-branding-COPYING
Source4:        gnome-wallpaper-11.0.1.tar.bz2
Source5:        GnomeOnlineHelp.desktop
Source6:        SuSE.desktop
# PATCH-FEATURE-OPENSUSE gnome-panel-layout.patch -- panel-default-setup.entries patch for gnome-panel:
Patch0:         gnome-panel-layout.patch
# PATCH-FEATURE-OPENSUSE gnome-panel-layout-SLES.patch -- panel-default-setup.entries patch for gnome-panel:
Patch1:         gnome-panel-layout-SLES.patch
Provides:       gconf2-branding = 2.20
Conflicts:      otherproviders(gconf2-branding)
Supplements:    packageand(branding-SLES:gconf2)
# This package provides openSUSE gnome-session splash:
Provides:       gnome-session-branding = 2.20
Provides:       gnome-session-branding-SLES = 2.20
Supplements:    packageand(branding-SLES:gnome-session)
BuildRequires:  desktop-data-%{desktop_data} gconf2
# For directory ownership of %{_datadir}/pixmaps/splash:
# BuildRequires:  gnome-session
# For directory ownership of %{_datadir}/backgrounds:
# BuildRequires:  gnome-themes
#BRAND: gconf2-branding-openSUSE provides branding Look and Feel using
#BRAND: gconf schemas. All referenced files must be present in this
#BRAND: package or in required packages.
# Referenced Metacity theme Gilouche is part of gtk2-theme-openSUSE:
Requires:       gtk2-theme-%{desktop_data} desktop-data-%{desktop_data} = 11.1
Suggests:       desktop-data-SLES-extra-gnome

%description
This package provides SLES defaults for configurations based on GConf
database system.



%package -n desktop-data-SLES-extra-gnome
License:        BSD 3-Clause
Enhances:       gconf2-branding-SLES
Supplements:    desktop-data-%{desktop_data}-extra
Summary:        SLES defaults for the GNOME configuration system
Group:          System/GUI/GNOME
Version:        11.0.1
Release:        4

%description -n desktop-data-SLES-extra-gnome
This package provides SLES defaults for configurations based on GConf
database system.



%prep
%setup -q -T -a4 -c %{name}-%{version}
cp -a %{S:1} gnome-splash-SLES.png
cp -a %{S:2} .
cp -a %{S:3} COPYING
%if %build_openSUSE || %build_SLED
%patch
%endif
%if %build_SLES
%patch1
%endif

%build
mkdir -p grass
cp -a *-grass-*.png grass.xml grass

%install
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash $RPM_BUILD_ROOT%{_datadir}/backgrounds $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties
install -m0644 gnome-splash-SLES.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/splash/
cp -a grass $RPM_BUILD_ROOT%{_datadir}/backgrounds/
install -m0644 desktop-backgrounds-grass.xml $RPM_BUILD_ROOT%{_datadir}/gnome-background-properties/desktop-data-SLES-extra-gnome.xml
# http://en.opensuse.org/GNOME/Projects/SchemasChanges
# Only vendor preferences are allowed here.
# Stuff to "Make OpenSUSE working must remain in particular packages!
%define gconf_call gconftool-2 --direct --config-source=xml::$RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
%define gconf_set %gconf_call --set
%define gconf_load %gconf_call --load
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
# Set actions list differently from upstream:
# FIXME: NEEDS-REBASE
#%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Add Printer;gnome-cups-manager.desktop,Configure Network;YaST2/lan.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]"
# Change epiphany homepage:
%if %build_openSUSE
%gconf_set /apps/epiphany/general/homepage --type=string "http://www.opensuse.org/"
%endif
%if %build_SLED || %build_SLES
%gconf_set /apps/epiphany/general/homepage --type=string "http://www.novell.com/linux/"
%endif
# Globally disable movement of predefined panels in gnome-panel:
%gconf_set /apps/panel/global/disable_movement --type=bool "true"
# Display all workspaces in the gnome-panel window list applet:
# FIXME: This key has no applyto and it cannot work. But it is now the default.
#%gconf_set /schemas/apps/window_list_applet/prefs/display_all_workspaces --type=bool "true"
# Enable Energy Star compliant default configuration
%gconf_set /apps/gnome-power-manager/actions/sleep_type_battery --type=string "suspend"
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_battery --type=int 1200
%gconf_set /apps/gnome-power-manager/timeout/sleep_computer_ac --type=int 1200
%gconf_set /apps/gnome-power-manager/timeout/sleep_display_ac --type=int 300
# Use custom splash screen in gnome-session:
%gconf_set /apps/gnome-session/options/splash_image --type=string "%{_datadir}/pixmaps/splash/gnome-splash-SLES.png"
# Use gnome-wm as default window manager:
%gconf_set /desktop/gnome/session/required_components/windowmanager --type=string "gnome-wm"
# Define default keybinding of gnome-settings-daemon:
# FIX-OPENSUSE gnome-settings-daemon-default-config.patch
%gconf_set /apps/gnome_settings_daemon/keybindings/help --type=string "XF86Help"
# Do not show process 'estimated memory usage' column on startup:
# FIX-UPSTREAM gnome-system-monitor-resident-schema.patch bnc157022 bgo336376 joeshaw@novell.com -- Probably need to really show Resident by default
%gconf_set /apps/procman/proctree/col_15_visible --type=bool "FALSE"
%gconf_set /apps/gnome-terminal/global/use_mnemonics --type=bool "false"
%gconf_set /apps/gnome-terminal/global/use_menu_accelerators --type=bool "false"
# Use firefox, not epiphany for all apps handled by gnome-vfs2 and libgnome (keep inactive for ftp):
%gconf_set /desktop/gnome/url-handlers/http/command --type=string "firefox %s"
%gconf_set /desktop/gnome/url-handlers/https/command --type=string "firefox %s"
%gconf_set /desktop/gnome/url-handlers/ftp/command --type=string "firefox %s"
%gconf_set /desktop/gnome/applications/browser/exec --type=string "firefox"
# Use xchat for irc
%gconf_set /desktop/gnome/url-handlers/irc/command --type=string "xchat --existing --url=%s"
%gconf_set /desktop/gnome/url-handlers/irc/enabled --type=bool "true"
# Prefer OpenSUSE applications in gnome-volume-manager:
%gconf_set /desktop/gnome/volume_manager/autophoto_command --type=string "f-spot-import %h"
%gconf_set /desktop/gnome/volume_manager/autoprinter_command --type=string "add-unknown-printer %h"
%gconf_set /desktop/gnome/volume_manager/autovideocam_command --type=string "kino %d"
# Auto run photo management command:
%gconf_set /desktop/gnome/volume_manager/autophoto --type=bool "true"
# Auto run scanner program
%gconf_set /desktop/gnome/volume_manager/autoscanner --type=bool "true"
# Auto run video editing program
%gconf_set /desktop/gnome/volume_manager/autovideocam --type=bool "true"
# Change default look of GNOME in libgnome:
# Change default background (scriptlets may alter this value):
%if %build_openSUSE
test -f %{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png
# WARNING: Don't forget to change value in scriptlets below:
%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png"
%endif
%if %build_SLED || %build_SLES
test -f %{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg
# WARNING: Don't forget to change value in scriptlets below:
%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg"
%endif
%gconf_set /desktop/gnome/background/picture_options --type=string "stretched"
%gconf_set /desktop/gnome/background/primary_color --type=string "#258c06"
%gconf_set /desktop/gnome/background/secondary_color --type=string "#258c06"
%gconf_set /desktop/gnome/file_views/icon_theme --type=string "Gilouche"
%gconf_set /desktop/gnome/interface/accessibility --type=bool "false"
%gconf_set /desktop/gnome/interface/icon_theme --type=string "Gilouche"
# WARNING: gtk2-branding-SLES must contain the same, otherwise it
# will change when gnome-settings-daemon starts:
%gconf_set /desktop/gnome/interface/gtk_theme --type=string "Gilouche"
# Enable sound events by default in libgnome:
%gconf_set /desktop/gnome/sound/enable_esd --type=bool "false"
%gconf_set /desktop/gnome/sound/event_sounds --type=bool "true"
# Disable audible bell in metacity:
%gconf_set /apps/metacity/general/audible_bell --type=bool "false"
%if %build_SLED || %build_SLES
# Enable Windows flag keys to show the panel's main menu in SLED:
%gconf_set /apps/metacity/global_keybindings/panel_main_menu_list --type=list --list-type=string "[Super_L,Super_R]"
%endif
# Change default theme in Metacity:
%gconf_set /apps/metacity/general/theme --type=string "Gilouche"
# FIX-OPENSUSE nautilus-config-defaults.patch -- Default configuration
# Enables the classic Nautilus behavior, where all windows are browsers:
%gconf_set /apps/nautilus/preferences/always_use_browser --type=bool "true"
# Never preview sounds when mousing over an icon:
%gconf_set /apps/nautilus/preferences/preview_sound --type=string "never"
# Computer icon invisible on desktop:
%gconf_set /apps/nautilus/desktop/computer_icon_visible --type=bool "false"
# Change notification-daemon theme used when displaying notifications:
%gconf_set /apps/notification-daemon/theme --type=string "bubble"
#
# And generate default GNOME panel layout:
export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
%gconf_load panel-default-setup.entries
#
# Merge is optional, but one larger file is better than many small files:
gconf-merge-tree $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor
rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/*/*
rmdir $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor/* 2>/dev/null || :
# This is deliberately done after the merge. We may want to modify it in scriptlets.
#
# Set up .desktop files to be shown in users' desktops
%gconf_set /apps/nautilus/desktop/predefined_items_dir --type=string /usr/share/dist/desktop-files
install -d $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files
install -m 0644 %{S:5} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/
install -m 0644 %{S:6} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/

%clean
rm -rf $RPM_BUILD_ROOT

%triggerin -- desktop-data-SLES-extra-gnome
# If desktop-data-SLES-extra-gnome exists, we want nice dynamic background.
gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
    /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/grass/grass.xml"

%triggerpostun -- desktop-data-SLES-extra-gnome
# If desktop-data-SLES-extra-gnome exists, we want nice dynamic background.
if ! test -f %{_datadir}/backgrounds/grass/grass.xml ; then
%if %build_openSUSE
  gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
    /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png"
%endif
%if %build_SLED || %build_SLES
  gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
    /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg"
%endif
fi

%post
# If desktop-data-SLES-extra-gnome exists, we want nice dynamic background.
if test -f %{_datadir}/backgrounds/grass/grass.xml ; then
  gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\
    /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/grass/grass.xml"
fi

%files
%defattr(-,root,root)
%doc COPYING
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
%dir %{_datadir}/pixmaps/splash
%{_datadir}/pixmaps/splash/gnome-splash-SLES.png
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/dist
%dir %{_datadir}/dist/desktop-files
%{_datadir}/dist/desktop-files/*

%files -n desktop-data-SLES-extra-gnome
%defattr(-,root,root)
%doc COPYING
%{_datadir}/backgrounds/grass
%{_datadir}/gnome-background-properties/desktop-data-SLES-extra-gnome.xml
# FIXME: Should be owned by a different package:
%dir %{_datadir}/backgrounds
%dir %{_datadir}/gnome-background-properties

%changelog
* Fri Oct 17 2008 vuntz@novell.com
- Merge the openSUSE/SLED/SLES gconf2-branding packages, for
  easier maintenance.
- Remove use of %%sles_version and do the appropriate thing so that
  what we wanted to have in SLES/SLED and not in openSUSE happens.
- Remove /apps/gnome-power-manager/ui/cpufreq_show change: this
  feature was removed upstream.
- Remove branding for volume_mute, volume_down, volume_up, eject,
  search, email, www since upstream has the right values now.
- Use XF86Help for the help keybinding instead of 0xf5.
- Bump version to 2.24, since we have gconf2 2.24.
* Mon Oct 06 2008 sbrabec@suse.cz
- Conflict with other branding providers (FATE#304881).
* Tue Sep 30 2008 sbrabec@suse.cz
- Fixed directory ownership.
* Mon Sep 22 2008 federico@novell.com 
- Install GnomeOnlineHelp.desktop and SuSE.desktop in
  /usr/share/dist/desktop-files, and set the GConf key
  /apps/nautilus/desktop/predefined_items_dir to point to that
  directory.  This is the new way to define .desktop items that will
  appear in users' desktops.
* Thu Sep 18 2008 rodrigo@suse.de
- Moved gnome-power-manager-energy-star.patch here, adding default
  Energy Star compliant default configuration (fate#304708)
* Wed Sep 10 2008 rodrigo@novell.com
- Set gnome-wm script as default window manager, so that we can
  start compiz whenever the hardware allows (fate#304762)
* Tue Jul 22 2008 vuntz@novell.com
- Keep upstream default for the number of workspace (4).
- Change panel layout to have the workspace switcher by default.
* Tue Jul 15 2008 coolo@suse.de
- adapt the required openSUSE version
* Tue Jun 24 2008 rodrigo@suse.de
- Disable ESD startup by default to avoid weird things happening
  when running GNOME apps with root (YaST) (bnc#387052)
* Thu May 29 2008 sbrabec@suse.cz
- Use Gilouche theme instead of Industrial (bnc#391865).
* Tue May 20 2008 rodrigo@suse.de
- Updated gnome-panel-layout.patch to re-add the mixer applet to
  default setups, now that it uses PulseAudio's volume control
* Tue May 13 2008 vuntz@suse.de
- Change the way we activate the main menu with the flag keys.
  Instead of relying on a patch that breaks in some cases (see
  bnc#372423), we use Super_L and Super_R in
  /apps/metacity/global_keybindings/panel_main_menu_list
* Thu May 01 2008 vuntz@suse.de
- Add irc: URL handler for xchat. Fix bnc#372232.
* Wed Apr 30 2008 vuntz@suse.de
- Fix the path to the default background in gconf
  (s/backgrounds/wallpapers/)
* Tue Apr 29 2008 vuntz@suse.de
- Don't set the following settings (consensus reached on mailing
  list):
  + /apps/file-roller/listing/list_mode to "all_files"
  + /apps/ghex2/datafont to "Courier Bold 12"
  + /apps/ghex2/headerfont to "Courier Bold 12"
  + /apps/stickynotes_applet/defaults/color to "#E1D54B"
  + /apps/stickynotes_applet/settings/use_system_color to "false"
  + /desktop/gnome/volume_manager/autoplay_cda_command to "banshee
    --play --audio-cd %%d"
  + /desktop/gnome/volume_manager/autoburn_audio_cd_command to
  "banshee --burn-cd %%d"
  + /desktop/gnome/volume_manager/autoipod_command to "banshee
    --dap %%h"
  + /desktop/gnome/volume_manager/autoburn to "true"
  + /desktop/gnome/volume_manager/autoplay_dvd to "true"
  + /desktop/gnome/volume_manager/autoipod to "true"
- Note that banshee will still be the default command for CD/music
  players -- it just moved from gnome-volume-manager to nautilus
  and some mime type magic.
- Remove duplicate /desktop/gnome/sound/enable_esd
- Change the default epiphany homepage to www.opensuse.org
* Wed Apr 23 2008 rodrigo@suse.de
- Start sound server (PulseAudio) by default (bnc#377065)
* Mon Apr 21 2008 sbrabec@suse.cz
- gnome-wallpaper-openSUSE renamed to
  desktop-data-openSUSE-extra-gnome to better reflect other package
  names.
- desktop-data-openSUSE-extra-gnome now supplements
  desktop-data-openSUSE-extra.
* Thu Apr 17 2008 sbrabec@suse.cz
- Removed background symlinks and handle it correctly in
  desktop-data-openSUSE.
* Wed Apr 16 2008 sbrabec@suse.cz
- Default background fixes (bnc#369924):
  * Use wallpaper file from desktop-data-openSUSE.
  * New optional dynamic wallpaper in gnome-wallpaper-openSUSE
  package.
  * Symliked all desktop-data-openSUSE wallpapers for convenience.
* Mon Apr 14 2008 mrueckert@suse.de
- dont require packages just for the directory ownership.
* Mon Apr 14 2008 sbrabec@suse.cz
- Added openSUSE 11.0 GNOME splash (bnc#361234).
- Added openSUSE 11.0 default background (bnc#369924).
- Use packageand form of branding supplement.
* Wed Apr 09 2008 sbrabec@suse.cz
- Added COPYING file (bnc#369961).
* Mon Apr 07 2008 sbrabec@suse.cz
- Require gtk2-theme-openSUSE containing Metacity theme Gilouche.
* Tue Apr 01 2008 vuntz@suse.de
- Don't turn on metacity compositing manager by default. It might
  not work well for everybody, so stay with upstream default for
  now (ie, disabled by default).
* Thu Mar 20 2008 sbrabec@suse.cz
- Fixed windows keys settings: On for SLED, Off for openSUSE.
* Wed Mar 19 2008 rodrigo@suse.de
- Removed mixer applet from default panel configuration.
* Fri Mar 14 2008 sbrabec@suse.cz
- Disable movement moved from gnome-panel to branding.
- Clean up of default configuration.
* Thu Mar 13 2008 sbrabec@suse.cz
- New SuSE package, collects all gconf vendor defaults
  (fate#301464, fate#301792).
- Included gnome-session-branding-openSUSE.
- Included default GNOME panel configuration (fate#301474).
++++++ gnome-panel-layout.patch ++++++
--- panel-default-setup.entries.old	2008-07-22 11:22:03.000000000 +0200
+++ panel-default-setup.entries	2008-07-22 12:09:47.000000000 +0200
@@ -9,9 +9,11 @@
       /schemas/apps/panel/general/toplevel_id_list
       <value>
         <list type="string">
+<!--
           <value>
             <string>top_panel</string>
           </value>
+-->
           <value>
             <string>bottom_panel</string>
           </value>
@@ -26,15 +28,14 @@
       /schemas/apps/panel/general/object_id_list
       <value>
         <list type="string">
-          <value>
-            <string>menu_bar</string>
-          </value>
+<!--
           <value>
             <string>browser_launcher</string>
           </value>
           <value>
             <string>email_launcher</string>
           </value>
+-->
         </list>
       </value>
     </entry>
@@ -47,8 +48,16 @@
       <value>
         <list type="string">
           <value>
+            <string>main_menu</string>
+          </value>
+<!--
+          <value>
             <string>window_menu</string>
           </value>
+-->
+          <value>
+            <string>tomboy</string>
+          </value>
           <value>
             <string>mixer</string>
           </value>
@@ -72,6 +81,7 @@
     </entry>
 
   <!-- Top Panel -->
+<!--
 
     <entry>
       <key>toplevels/top_panel/expand</key>
@@ -84,7 +94,7 @@
       <key>toplevels/top_panel/disable_movement</key>
       <schema_key>/schemas/apps/panel/toplevels/disable_movement</schema_key>
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
@@ -125,6 +135,7 @@
     <entry><key>toplevels/top_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
     <entry><key>toplevels/top_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
     <entry><key>toplevels/top_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
+-->
 
   <!-- Bottom Panel -->
 
@@ -139,7 +150,7 @@
       <key>toplevels/bottom_panel/disable_movement</key>
       /schemas/apps/panel/toplevels/disable_movement
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
@@ -157,7 +168,7 @@
       </value>
     </entry>
     <entry>
-      <key>toplevels/top_panel/y_bottom</key>
+      <key>toplevels/bottom_panel/y_bottom</key>
       /schemas/apps/panel/toplevels/y_bottom
       <value>
         <int>0</int>
@@ -169,7 +180,7 @@
     <entry><key>toplevels/bottom_panel/monitor</key>/schemas/apps/panel/toplevels/monitor</entry>
     <entry><key>toplevels/bottom_panel/x</key>/schemas/apps/panel/toplevels/x</entry>
     <entry><key>toplevels/bottom_panel/y</key>/schemas/apps/panel/toplevels/y</entry>
-    <entry><key>toplevels/top_panel/x_right</key>/schemas/apps/panel/toplevels/x_right</entry>
+    <entry><key>toplevels/bottom_panel/x_right</key>/schemas/apps/panel/toplevels/x_right</entry>
     <entry><key>toplevels/bottom_panel/x_centered</key>/schemas/apps/panel/toplevels/x_centered</entry>
     <entry><key>toplevels/bottom_panel/y_centered</key>/schemas/apps/panel/toplevels/y_centered</entry>
     <entry><key>toplevels/bottom_panel/auto_hide</key>/schemas/apps/panel/toplevels/auto_hide</entry>
@@ -187,8 +198,62 @@
     <entry><key>toplevels/bottom_panel/background/stretch</key>/schemas/apps/panel/toplevels/background/stretch</entry>
     <entry><key>toplevels/bottom_panel/background/rotate</key>/schemas/apps/panel/toplevels/background/rotate</entry>
 
-  <!-- Menu Bar -->
+  <!-- Main Menu Slab -->
+
+    <entry>
+      <key>applets/main_menu/object_type</key>
+      /schemas/apps/panel/objects/object_type
+      <value>
+        <string>bonobo-applet</string>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/main_menu/toplevel_id</key>
+      /schemas/apps/panel/objects/toplevel_id
+      <value>
+        <string>bottom_panel</string>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/main_menu/position</key>
+      /schemas/apps/panel/objects/position
+      <value>
+        <int>0</int>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/main_menu/panel_right_stick</key>
+      /schemas/apps/panel/objects/panel_right_stick
+      <value>
+        <bool>false</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/main_menu/locked</key>
+      /schemas/apps/panel/objects/locked
+      <value>
+        <bool>false</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/main_menu/bonobo_iid</key>
+      /schemas/apps/panel/objects/bonobo_iid
+      <value>
+        <string>OAFIID:GNOME_MainMenu</string>
+      </value>
+    </entry>
 
+    <entry><key>applets/main_menu/attached_toplevel_id</key>/schemas/apps/panel/objects/attached_toplevel_id </entry>
+    <entry><key>applets/main_menu/tooltip</key>/schemas/apps/panel/objects/tooltip</entry>
+    <entry><key>applets/main_menu/use_custom_icon</key>/schemas/apps/panel/objects/use_custom_icon</entry>
+    <entry><key>applets/main_menu/custom_icon</key>/schemas/apps/panel/objects/custom_icon</entry>
+    <entry><key>applets/main_menu/use_menu_path</key>/schemas/apps/panel/objects/use_menu_path</entry>
+    <entry><key>applets/main_menu/menu_path</key>/schemas/apps/panel/objects/menu_path</entry>
+    <entry><key>applets/main_menu/launcher_location</key>/schemas/apps/panel/objects/launcher_location</entry>
+    <entry><key>applets/main_menu/action_type</key>/schemas/apps/panel/objects/action_type</entry>
+
+  <!-- Menu Bar -->
+<!--
     <entry>
       <key>objects/menu_bar/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
@@ -200,7 +265,7 @@
       <key>objects/menu_bar/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
-        <string>top_panel</string>
+        <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
@@ -221,7 +286,7 @@
       <key>objects/menu_bar/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
 
@@ -234,8 +299,10 @@
     <entry><key>objects/menu_bar/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
     <entry><key>objects/menu_bar/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
     <entry><key>objects/menu_bar/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+-->
 
   <!-- Browser Launcher -->
+<!--
 
     <entry>
       <key>objects/browser_launcher/object_type</key>
@@ -269,14 +336,14 @@
       <key>objects/browser_launcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
       <key>objects/browser_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>epiphany.desktop</string>
+        <string>MozillaFirefox-Gnome.desktop</string>
       </value>
     </entry>
 
@@ -288,8 +355,10 @@
     <entry><key>objects/browser_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
     <entry><key>objects/browser_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
     <entry><key>objects/browser_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+-->
 
   <!-- Email Launcher -->
+<!--
 
     <entry>
       <key>objects/email_launcher/object_type</key>
@@ -323,14 +392,14 @@
       <key>objects/email_launcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
       <key>objects/email_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>evolution.desktop</string>
+        <string>/usr/share/applications/evolution-email.desktop</string>
       </value>
     </entry>
 
@@ -342,8 +411,10 @@
     <entry><key>objects/email_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
     <entry><key>objects/email_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
     <entry><key>objects/email_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+-->
 
   <!-- Window Menu Applet -->
+<!--
 
     <entry>
       <key>applets/window_menu/object_type</key>
@@ -377,7 +448,7 @@
       <key>applets/window_menu/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -396,9 +467,65 @@
     <entry><key>applets/window_menu/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
     <entry><key>applets/window_menu/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
     <entry><key>applets/window_menu/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+-->
+
+  <!-- Tomboy Applet -->
+
+    <entry>
+      <key>applets/tomboy/object_type</key>
+      /schemas/apps/panel/objects/object_type
+      <value>
+        <string>bonobo-applet</string>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/tomboy/toplevel_id</key>
+      /schemas/apps/panel/objects/toplevel_id
+      <value>
+        <string>bottom_panel</string>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/tomboy/position</key>
+      /schemas/apps/panel/objects/position
+      <value>
+        <int>103</int>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/tomboy/panel_right_stick</key>
+      /schemas/apps/panel/objects/panel_right_stick
+      <value>
+        <bool>false</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/tomboy/locked</key>
+      /schemas/apps/panel/objects/locked
+      <value>
+        <bool>false</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/tomboy/bonobo_iid</key>
+      /schemas/apps/panel/objects/bonobo_iid
+      <value>
+        <string>OAFIID:TomboyApplet</string>
+      </value>
+    </entry>
+
+    <entry><key>applets/tomboy/attached_toplevel_id</key>/schemas/apps/panel/objects/attached_toplevel_id </entry>
+    <entry><key>applets/tomboy/tooltip</key>/schemas/apps/panel/objects/tooltip</entry>
+    <entry><key>applets/tomboy/use_custom_icon</key>/schemas/apps/panel/objects/use_custom_icon</entry>
+    <entry><key>applets/tomboy/custom_icon</key>/schemas/apps/panel/objects/custom_icon</entry>
+    <entry><key>applets/tomboy/use_menu_path</key>/schemas/apps/panel/objects/use_menu_path</entry>
+    <entry><key>applets/tomboy/menu_path</key>/schemas/apps/panel/objects/menu_path</entry>
+    <entry><key>applets/tomboy/launcher_location</key>/schemas/apps/panel/objects/launcher_location</entry>
+    <entry><key>applets/tomboy/action_type</key>/schemas/apps/panel/objects/action_type</entry>
 
   <!-- Mixer Applet -->
 
+
     <entry>
       <key>applets/mixer/object_type</key>
       /schemas/apps/panel/objects/object_type
@@ -410,14 +537,14 @@
       <key>applets/mixer/toplevel_id</key>
       /schemas/apps/panel/objects/toplevel_id
       <value>
-        <string>top_panel</string>
+        <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
       <key>applets/mixer/position</key>
       /schemas/apps/panel/objects/position
       <value>
-        <int>1</int>
+        <int>3</int>
       </value>
     </entry>
     <entry>
@@ -431,7 +558,7 @@
       <key>applets/mixer/locked</key>
       /schemas/apps/panel/objects/locked
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -451,6 +578,7 @@
     <entry><key>applets/mixer/launcher_location</key>/schemas/apps/panel/objects/launcher_location</entry>
     <entry><key>applets/mixer/action_type</key>/schemas/apps/panel/objects/action_type</entry>
 
+
   <!-- Clock Applet -->
 
     <entry>
@@ -464,14 +592,14 @@
       <key>applets/clock/toplevel_id</key>
       /schemas/apps/panel/objects/toplevel_id
       <value>
-        <string>top_panel</string>
+        <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
       <key>applets/clock/position</key>
       /schemas/apps/panel/objects/position
       <value>
-        <int>2</int>
+        <int>1</int>
       </value>
     </entry>
     <entry>
@@ -485,7 +613,7 @@
       <key>applets/clock/locked</key>
       /schemas/apps/panel/objects/locked
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -518,14 +646,14 @@
       <key>applets/notification_area/toplevel_id</key>
       /schemas/apps/panel/objects/toplevel_id
       <value>
-        <string>top_panel</string>
+        <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
       <key>applets/notification_area/position</key>
       /schemas/apps/panel/objects/position
       <value>
-        <int>3</int>
+        <int>4</int>
       </value>
     </entry>
     <entry>
@@ -539,7 +667,7 @@
       <key>applets/notification_area/locked</key>
       /schemas/apps/panel/objects/locked
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -586,14 +714,14 @@
       <key>applets/show_desktop_button/panel_right_stick</key>
       /schemas/apps/panel/objects/panel_right_stick
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
       <key>applets/show_desktop_button/locked</key>
       /schemas/apps/panel/objects/locked
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -633,7 +761,7 @@
       <key>applets/window_list/position</key>
       /schemas/apps/panel/objects/position
       <value>
-        <int>1</int>
+        <int>125</int>
       </value>
     </entry>
     <entry>
@@ -647,7 +775,7 @@
       <key>applets/window_list/locked</key>
       /schemas/apps/panel/objects/locked
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -687,7 +815,7 @@
       <key>applets/workspace_switcher/position</key>
       /schemas/apps/panel/objects/position
       <value>
-        <int>0</int>
+        <int>2</int>
       </value>
     </entry>
     <entry>
@@ -701,7 +829,7 @@
       <key>applets/workspace_switcher/locked</key>
       /schemas/apps/panel/objects/locked
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -720,7 +848,6 @@
     <entry><key>applets/workspace_switcher/menu_path</key>/schemas/apps/panel/objects/menu_path</entry>
     <entry><key>applets/workspace_switcher/launcher_location</key>/schemas/apps/panel/objects/launcher_location</entry>
     <entry><key>applets/workspace_switcher/action_type</key>/schemas/apps/panel/objects/action_type</entry>
-
   </entrylist>
 
 </gconfentryfile>
++++++ gnome-panel-layout-SLES.patch ++++++
--- panel-default-setup.entries.old	2008-09-22 22:47:37.844128000 +0200
+++ panel-default-setup.entries	2008-09-22 22:48:19.022911000 +0200
@@ -9,9 +9,11 @@
       /schemas/apps/panel/general/toplevel_id_list
       <value>
         <list type="string">
+<!--
           <value>
             <string>top_panel</string>
           </value>
+-->
           <value>
             <string>bottom_panel</string>
           </value>
@@ -26,15 +28,14 @@
       /schemas/apps/panel/general/object_id_list
       <value>
         <list type="string">
-          <value>
-            <string>menu_bar</string>
-          </value>
+<!--
           <value>
             <string>browser_launcher</string>
           </value>
           <value>
             <string>email_launcher</string>
           </value>
+-->
         </list>
       </value>
     </entry>
@@ -47,8 +48,13 @@
       <value>
         <list type="string">
           <value>
+            <string>main_menu</string>
+          </value>
+<!--
+          <value>
             <string>window_menu</string>
           </value>
+-->
           <value>
             <string>mixer</string>
           </value>
@@ -72,6 +78,7 @@
     </entry>
 
   <!-- Top Panel -->
+<!--
 
     <entry>
       <key>toplevels/top_panel/expand</key>
@@ -84,7 +91,7 @@
       <key>toplevels/top_panel/disable_movement</key>
       <schema_key>/schemas/apps/panel/toplevels/disable_movement</schema_key>
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
@@ -125,6 +132,7 @@
     <entry><key>toplevels/top_panel/background/fit</key><schema_key>/schemas/apps/panel/toplevels/background/fit</schema_key></entry>
     <entry><key>toplevels/top_panel/background/stretch</key><schema_key>/schemas/apps/panel/toplevels/background/stretch</schema_key></entry>
     <entry><key>toplevels/top_panel/background/rotate</key><schema_key>/schemas/apps/panel/toplevels/background/rotate</schema_key></entry>
+-->
 
   <!-- Bottom Panel -->
 
@@ -139,7 +147,7 @@
       <key>toplevels/bottom_panel/disable_movement</key>
       /schemas/apps/panel/toplevels/disable_movement
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
@@ -157,7 +165,7 @@
       </value>
     </entry>
     <entry>
-      <key>toplevels/top_panel/y_bottom</key>
+      <key>toplevels/bottom_panel/y_bottom</key>
       /schemas/apps/panel/toplevels/y_bottom
       <value>
         <int>0</int>
@@ -169,7 +177,7 @@
     <entry><key>toplevels/bottom_panel/monitor</key>/schemas/apps/panel/toplevels/monitor</entry>
     <entry><key>toplevels/bottom_panel/x</key>/schemas/apps/panel/toplevels/x</entry>
     <entry><key>toplevels/bottom_panel/y</key>/schemas/apps/panel/toplevels/y</entry>
-    <entry><key>toplevels/top_panel/x_right</key>/schemas/apps/panel/toplevels/x_right</entry>
+    <entry><key>toplevels/bottom_panel/x_right</key>/schemas/apps/panel/toplevels/x_right</entry>
     <entry><key>toplevels/bottom_panel/x_centered</key>/schemas/apps/panel/toplevels/x_centered</entry>
     <entry><key>toplevels/bottom_panel/y_centered</key>/schemas/apps/panel/toplevels/y_centered</entry>
     <entry><key>toplevels/bottom_panel/auto_hide</key>/schemas/apps/panel/toplevels/auto_hide</entry>
@@ -187,9 +195,63 @@
     <entry><key>toplevels/bottom_panel/background/stretch</key>/schemas/apps/panel/toplevels/background/stretch</entry>
     <entry><key>toplevels/bottom_panel/background/rotate</key>/schemas/apps/panel/toplevels/background/rotate</entry>
 
-  <!-- Menu Bar -->
+  <!-- Main Menu Slab -->
 
     <entry>
+      <key>applets/main_menu/object_type</key>
+      /schemas/apps/panel/objects/object_type
+      <value>
+        <string>bonobo-applet</string>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/main_menu/toplevel_id</key>
+      /schemas/apps/panel/objects/toplevel_id
+      <value>
+        <string>bottom_panel</string>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/main_menu/position</key>
+      /schemas/apps/panel/objects/position
+      <value>
+        <int>0</int>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/main_menu/panel_right_stick</key>
+      /schemas/apps/panel/objects/panel_right_stick
+      <value>
+        <bool>false</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/main_menu/locked</key>
+      /schemas/apps/panel/objects/locked
+      <value>
+        <bool>false</bool>
+      </value>
+    </entry>
+    <entry>
+      <key>applets/main_menu/bonobo_iid</key>
+      /schemas/apps/panel/objects/bonobo_iid
+      <value>
+        <string>OAFIID:GNOME_MainMenu</string>
+      </value>
+    </entry>
+
+    <entry><key>applets/main_menu/attached_toplevel_id</key>/schemas/apps/panel/objects/attached_toplevel_id </entry>
+    <entry><key>applets/main_menu/tooltip</key>/schemas/apps/panel/objects/tooltip</entry>
+    <entry><key>applets/main_menu/use_custom_icon</key>/schemas/apps/panel/objects/use_custom_icon</entry>
+    <entry><key>applets/main_menu/custom_icon</key>/schemas/apps/panel/objects/custom_icon</entry>
+    <entry><key>applets/main_menu/use_menu_path</key>/schemas/apps/panel/objects/use_menu_path</entry>
+    <entry><key>applets/main_menu/menu_path</key>/schemas/apps/panel/objects/menu_path</entry>
+    <entry><key>applets/main_menu/launcher_location</key>/schemas/apps/panel/objects/launcher_location</entry>
+    <entry><key>applets/main_menu/action_type</key>/schemas/apps/panel/objects/action_type</entry>
+
+  <!-- Menu Bar -->
+<!--
+    <entry>
       <key>objects/menu_bar/object_type</key>
       <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
       <value>
@@ -200,7 +262,7 @@
       <key>objects/menu_bar/toplevel_id</key>
       <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
       <value>
-        <string>top_panel</string>
+        <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
@@ -221,7 +283,7 @@
       <key>objects/menu_bar/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
 
@@ -234,8 +296,10 @@
     <entry><key>objects/menu_bar/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
     <entry><key>objects/menu_bar/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
     <entry><key>objects/menu_bar/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+-->
 
   <!-- Browser Launcher -->
+<!--
 
     <entry>
       <key>objects/browser_launcher/object_type</key>
@@ -269,14 +333,14 @@
       <key>objects/browser_launcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
       <key>objects/browser_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>epiphany.desktop</string>
+        <string>MozillaFirefox-Gnome.desktop</string>
       </value>
     </entry>
 
@@ -288,8 +352,10 @@
     <entry><key>objects/browser_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
     <entry><key>objects/browser_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
     <entry><key>objects/browser_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+-->
 
   <!-- Email Launcher -->
+<!--
 
     <entry>
       <key>objects/email_launcher/object_type</key>
@@ -323,14 +389,14 @@
       <key>objects/email_launcher/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
       <key>objects/email_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>evolution.desktop</string>
+        <string>/usr/share/applications/evolution-email.desktop</string>
       </value>
     </entry>
 
@@ -342,8 +408,10 @@
     <entry><key>objects/email_launcher/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
     <entry><key>objects/email_launcher/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
     <entry><key>objects/email_launcher/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+-->
 
   <!-- Window Menu Applet -->
+<!--
 
     <entry>
       <key>applets/window_menu/object_type</key>
@@ -377,7 +445,7 @@
       <key>applets/window_menu/locked</key>
       <schema_key>/schemas/apps/panel/objects/locked</schema_key>
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -396,9 +464,11 @@
     <entry><key>applets/window_menu/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
     <entry><key>applets/window_menu/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
     <entry><key>applets/window_menu/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+-->
 
   <!-- Mixer Applet -->
 
+
     <entry>
       <key>applets/mixer/object_type</key>
       /schemas/apps/panel/objects/object_type
@@ -410,14 +480,14 @@
       <key>applets/mixer/toplevel_id</key>
       /schemas/apps/panel/objects/toplevel_id
       <value>
-        <string>top_panel</string>
+        <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
       <key>applets/mixer/position</key>
       /schemas/apps/panel/objects/position
       <value>
-        <int>1</int>
+        <int>3</int>
       </value>
     </entry>
     <entry>
@@ -431,7 +501,7 @@
       <key>applets/mixer/locked</key>
       /schemas/apps/panel/objects/locked
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -451,6 +521,7 @@
     <entry><key>applets/mixer/launcher_location</key>/schemas/apps/panel/objects/launcher_location</entry>
     <entry><key>applets/mixer/action_type</key>/schemas/apps/panel/objects/action_type</entry>
 
+
   <!-- Clock Applet -->
 
     <entry>
@@ -464,14 +535,14 @@
       <key>applets/clock/toplevel_id</key>
       /schemas/apps/panel/objects/toplevel_id
       <value>
-        <string>top_panel</string>
+        <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
       <key>applets/clock/position</key>
       /schemas/apps/panel/objects/position
       <value>
-        <int>2</int>
+        <int>1</int>
       </value>
     </entry>
     <entry>
@@ -485,7 +556,7 @@
       <key>applets/clock/locked</key>
       /schemas/apps/panel/objects/locked
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -518,14 +589,14 @@
       <key>applets/notification_area/toplevel_id</key>
       /schemas/apps/panel/objects/toplevel_id
       <value>
-        <string>top_panel</string>
+        <string>bottom_panel</string>
       </value>
     </entry>
     <entry>
       <key>applets/notification_area/position</key>
       /schemas/apps/panel/objects/position
       <value>
-        <int>3</int>
+        <int>4</int>
       </value>
     </entry>
     <entry>
@@ -539,7 +610,7 @@
       <key>applets/notification_area/locked</key>
       /schemas/apps/panel/objects/locked
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -586,14 +657,14 @@
       <key>applets/show_desktop_button/panel_right_stick</key>
       /schemas/apps/panel/objects/panel_right_stick
       <value>
-        <bool>false</bool>
+        <bool>true</bool>
       </value>
     </entry>
     <entry>
       <key>applets/show_desktop_button/locked</key>
       /schemas/apps/panel/objects/locked
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -633,7 +704,7 @@
       <key>applets/window_list/position</key>
       /schemas/apps/panel/objects/position
       <value>
-        <int>1</int>
+        <int>125</int>
       </value>
     </entry>
     <entry>
@@ -647,7 +718,7 @@
       <key>applets/window_list/locked</key>
       /schemas/apps/panel/objects/locked
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -687,7 +758,7 @@
       <key>applets/workspace_switcher/position</key>
       /schemas/apps/panel/objects/position
       <value>
-        <int>0</int>
+        <int>2</int>
       </value>
     </entry>
     <entry>
@@ -701,7 +772,7 @@
       <key>applets/workspace_switcher/locked</key>
       /schemas/apps/panel/objects/locked
       <value>
-        <bool>true</bool>
+        <bool>false</bool>
       </value>
     </entry>
     <entry>
@@ -720,7 +791,6 @@
     <entry><key>applets/workspace_switcher/menu_path</key>/schemas/apps/panel/objects/menu_path</entry>
     <entry><key>applets/workspace_switcher/launcher_location</key>/schemas/apps/panel/objects/launcher_location</entry>
     <entry><key>applets/workspace_switcher/action_type</key>/schemas/apps/panel/objects/action_type</entry>
-
   </entrylist>
 
 </gconfentryfile>

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit gconf2-branding

root＠Hilbert.suse.de