Hello community, here is the log from the commit of package gconf2-branding-openSUSE for openSUSE:Factory checked in at Fri Jul 8 11:34:44 CEST 2011. -------- --- gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2011-02-25 11:31:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2011-07-06 23:37:18.000000000 +0200 @@ -1,0 +2,83 @@ +Fri Jul 1 18:14:36 CEST 2011 - vuntz@opensuse.org + +- Completely drop panel layout branding, as this is not handled in + gconf anymore: + + Drop panel-default-setup.entries source file. + + Drop gnome-panel-layout.patch, gnome-panel-layout-SLES.patch. + + Remove gnome-panel-branding-%{branding_name} subpackage. + + Remove gnome-panel BuildRequires. +- Remove default values for keys that are moved to GSettings (and + set in the new gio-branding-openSUSE), as part of bnc#676301 and + bnc#687780: + + /apps/epiphany/general/homepage + + /schemas/apps/window_list_applet/prefs/display_all_workspaces + + /apps/gnome-power-manager/actions/sleep_type_battery + + /apps/gnome-power-manager/notify/idle_sleep + + /apps/gnome-power-manager/timeout/sleep_display_ac + + /apps/gnome-power-manager/timeout/sleep_computer_battery + + /apps/gnome-power-manager/timeout/sleep_computer_ac + + /apps/gnome_settings_daemon/gtk-modules/pk-gtk-module + + /apps/gnome_settings_daemon/keybindings/help + + /desktop/gnome/peripherals/keyboard/general/groupPerWindow + + /desktop/gnome/background/picture_filename + + /desktop/gnome/background/picture_options + + /desktop/gnome/background/primary_color + + /desktop/gnome/background/secondary_color + + /desktop/gnome/interface/accessibility + + /desktop/gnome/interface/icon_theme + + /desktop/gnome/interface/gtk_theme + + /desktop/gnome/peripherals/mouse/cursor_theme + + /desktop/gnome/sound/event_sounds + + /desktop/gnome/sound/theme_name + + /apps/nautilus/preferences/preview_sound +- Remove default values that are now obsolete: + + /apps/control-center/cc_actions_list: the control center has + completely changed, and has nothing similar anymore + + /apps/gnome-packagekit/enable_check_hardware: + gnome-settings-daemon always checks for hardware now (and uses + udev instead of hal) + + /desktop/gnome/session/required_components/windowmanager: + this is now defined in gnome-session .session files. We used + gnome-wm to easily allow the use of compiz; now compiz should + provide a .session file (bnc#676360) + + /apps/gnome_settings_daemon/xrandr/show_notification_icon: + there is no such xrandr notification icon anymore + + /apps/procman/proctree/col_15_visible: the memory column in the + system monitor is now giving reasonable values, so we don't + need to hide it by default anymore + + /desktop/gnome/url-handlers/ftp/command, + /desktop/gnome/applications/browser/exec: this is now handled + with the MIME type system, (with + x-scheme-handler/{http,https,ftp} MIME types). Note that we + keep /desktop/gnome/url-handlers/http/command and + /desktop/gnome/url-handlers/https/command, but only because + Firefox looks at them to know if it's the default browser. + + /desktop/gnome/file_views/icon_theme: there is no such key + anymore (the general icon theme is used, I think) + + /desktop/gnome/sound/enable_esd: esound is not used anymore + + /apps/nautilus/desktop/computer_icon_visible: we don't show the + desktop by default anymore, so no need to change this + + /apps/notification-daemon/popup_location, + /apps/notification-daemon/theme: notification-daemon is not + configurable anymore +- Stop changing window theme-related keys, as we do not have any + other good theme than the upstream one for GNOME 3, right now: + + /apps/metacity/general/theme + + /apps/metacity/general/titlebar_font + + /desktop/gnome/shell/windows/theme +- Set /system/gstreamer/0.10/default/audiosrc to pulsesrc, as we + use PulseAudio. This makes empathy calls work better. +- Remove Requires that are related to gconf keys removed above: + desktop-data-%{desktop_data}, sonar-icon-theme, + gtk2-metatheme-sonar, dmz-icon-theme-cursors, fifth-leg-font. +- Change back Supplements from + packageand(gnome-session:branding-%{branding_name}) to + packageand(gconf2:branding-%{branding_name}) as there is no + Requires anymore for the branding package, and so it's no issue + to have this package installed in non-GNOME setups. +- Add a Requires for gconf2, since the branding package is useless + without it. Remove gconf2 PreReq, since we don't need gconf2 + before installation. +- Add Url tag. + +------------------------------------------------------------------- gconf2-branding-SLES.changes: same change gconf2-branding-openSUSE.changes: same change calling whatdependson for head-i586 Old: ---- gnome-panel-layout-SLES.patch gnome-panel-layout.patch panel-default-setup.entries ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.0xQzOt/_old 2011-07-08 11:31:56.000000000 +0200 +++ /var/tmp/diff_new_pack.0xQzOt/_new 2011-07-08 11:31:56.000000000 +0200 @@ -23,24 +23,21 @@ %if %build_openSUSE %define branding_name openSUSE +%define pkg_version 12.1 %define desktop_data openSUSE %define dynamic_file stripes/stripes.xml -%define desktop_data_ver 11.4 -%define wallpaper_file openSUSE-default.xml %endif # %%build_openSUSE %if %build_SLED %define branding_name SLED +%define pkg_version 11 %define desktop_data SLED -%define desktop_data_ver 11 %define dynamic_file nonexisting -%define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES %define branding_name SLES +%define pkg_version 11 %define desktop_data SLED -%define desktop_data_ver 11 %define dynamic_file nonexisting -%define wallpaper_file SLED110-1600x1200.png %endif # Do not edit this auto generated file! Edit gconf2-branding.spec.in. @@ -49,11 +46,10 @@ License: BSD3c(or similar) Group: System/GUI/GNOME Summary: SLED defaults for the GNOME configuration system -Version: %{desktop_data_ver} -Release: 10 +Version: %{pkg_version} +Release: 11 +Url: http://projects.gnome.org/gconf/ Source: gconf2-branding_spec-prepare.sh -# panel-default-setup.entries from gnome-panel (patched version): -Source2: panel-default-setup.entries Source3: gconf2-branding-COPYING %if %build_openSUSE # Launchers on the desktop @@ -74,34 +70,18 @@ Source31: novell-sound-desktop-login.ogg %endif Source99: HACKING -# 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 BuildRequires: desktop-data-%{desktop_data} BuildRequires: gconf2 +# For directory ownership of %{_datadir}/backgrounds: +# BuildRequires: gnome-themes %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) -BuildRequires: gnome-panel -%define gnome_panel_version %(rpm -q --qf '%%{version}-%%{release}' gnome-panel) +Requires: gconf2 = %{gconf2_version} Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) -Supplements: packageand(gnome-session:branding-SLED) -# For directory ownership of %{_datadir}/backgrounds: -# BuildRequires: gnome-themes +Supplements: packageand(gconf2:branding-SLED) #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. -PreReq: gconf2 -# Wallpaper -Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} -# Icon theme -Requires: sonar-icon-theme -# Metacity and gtk+ theme -Requires: gtk2-metatheme-sonar -# Cursor theme -Requires: dmz-icon-theme-cursors -# Window title font -Requires: fifth-leg-font %if %build_SLED || %build_SLES # Sound theme Requires: novell-sound-theme @@ -158,36 +138,13 @@ This packages provides the default sound theme by Novell. %endif -%if ! %build_SLES - -%package -n gnome-panel-branding-SLED -License: BSD3c(or similar) -Summary: SLED branding of gnome-panel -Group: System/GUI/GNOME -Requires: tomboy -Provides: gnome-panel-branding = %{gnome_panel_version} -Conflicts: otherproviders(gnome-panel-branding) -Supplements: packageand(gnome-panel:branding-SLED) -Supplements: packageand(gnome-panel:gconf2-branding-SLED) -BuildArch: noarch - -%description -n gnome-panel-branding-SLED -This package provides SLED Look and Feel for the GNOME -panel. -%endif - %prep %if %build_openSUSE %setup -q -T -a20 -a21 -a22 -a23 -a24 -c %{name}-%{version} %else %setup -q -T -c %{name}-%{version} %endif -cp -a %{S:2} . cp -a %{S:3} COPYING -%patch0 -%if %build_SLES -%patch1 -%endif %build %if %suse_version < 1140 @@ -244,111 +201,39 @@ %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: -# Note: please keep in sync the strings here with the strings added by -# gnome-control-center-shell-common-tasks-i18n.patch in gnome-control-center. -# Else, they won't be translated. -%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Change Look and Feel;gnome-appearance-properties.desktop,Set Preferred Applications;default-applications.desktop,Configure Printer;system-config-printer.desktop,Configure Network;nm-connection-editor.desktop,Edit Personal Information;gnome-about-me.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/11/" -%endif -# 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" # Icon used on gdm greeter %gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "distributor" # No user list in GDM for SLED/SLES %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "true" %endif -# Check if hardware drivers should be installed -%gconf_set /apps/gnome-packagekit/enable_check_hardware --type=bool "true" -# Depends on the gnome-power-manager-notify-idle-sleep.patch in g-p-m -%gconf_set /apps/gnome-power-manager/notify/idle_sleep --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_display_ac --type=int 300 -# To complete Energy Star compliant default configuration, you should enable this too: -# (disabled by default because suspending is not working fine in all cases) -#%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 -# Use gnome-wm as default window manager: -%gconf_set /desktop/gnome/session/required_components/windowmanager --type=string "gnome-wm" -# The PackageKit gtk+ module is too spammy, fdo#23917 -%gconf_set /apps/gnome_settings_daemon/gtk-modules/pk-gtk-module --type=bool "false" # Define default keybinding of gnome-settings-daemon: # FIX-OPENSUSE bnc#462640 vuntz@novell.com -- mute button always mute, instead of toggling %gconf_set /apps/gnome_settings_daemon/toggle_mute --type=bool "FALSE" -# FIX-OPENSUSE gnome-settings-daemon-default-config.patch -%gconf_set /apps/gnome_settings_daemon/keybindings/help --type=string "XF86Help" -# Set keyboard layout global per session instead of per window -# FIX-OPENSUSE bnc#540014 dimstar@opensuse.org -- Global keyboard layout instead of per window. -%gconf_set /desktop/gnome/peripherals/keyboard/general/groupPerWindow --type=bool "false" -# Enable xrandr notification by default bnc#440868 rodrigo@novell.com -%gconf_set /apps/gnome_settings_daemon/xrandr/show_notification_icon --type=bool "TRUE" -# 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" # Do not retain PK authorizations by default (bnc#431569) lnussel@suse.de %gconf_set /desktop/gnome/policykit/auth_dialog_retain_authorization --type=bool "false" -# Use firefox, not epiphany for all apps handled by gnome-vfs2 and libgnome (keep inactive for ftp). This is not needed anymore strictly speaking, with the move to x-scheme-handler, but Firefox still checks for those keys and some apps might do the same: +# This is not needed anymore strictly speaking, with the move to x-scheme-handler, but Firefox still checks for those keys and some apps might do the same: %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" -# Change default look of GNOME in libgnome: -# Change default background (scriptlets may alter this value): -test -f %{_datadir}/wallpapers/%{wallpaper_file} -# WARNING: Don't forget to change value in scriptlets below: -%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" -%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 "Sonar" -%gconf_set /desktop/gnome/interface/accessibility --type=bool "false" -%gconf_set /desktop/gnome/interface/icon_theme --type=string "Sonar" -# 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 "Sonar" -# WARNING: make sure this is the default theme that is also used in /var/adm/fillup-templates/sysconfig.windowmanager-desktop-data-openSUSE from desktop-data-openSUSE -%gconf_set /desktop/gnome/peripherals/mouse/cursor_theme --type=string "DMZ" -# 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" -%if %build_SLED || %build_SLES -%gconf_set /desktop/gnome/sound/theme_name --type=string "novell" -%endif # 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 +# We want to use pulseaudio by default; this makes empathy calls work better +%gconf_set /system/gstreamer/0.10/default/audiosrc --type=string "pulsesrc" +## Disabled since we don't have any other good theme than the upstream one for GNOME 3 # Change default theme in Metacity: -%gconf_set /apps/metacity/general/theme --type=string "Sonar" -%gconf_set /apps/metacity/general/titlebar_font --type=string "FifthLeg Bold 12" +#%%gconf_set /apps/metacity/general/theme --type=string "Sonar" +#%%gconf_set /apps/metacity/general/titlebar_font --type=string "FifthLeg Bold 12" # Change default theme in GNOME Shell: -%gconf_set /desktop/gnome/shell/windows/theme --type=string "Sonar" -# 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/popup_location --type=string "bottom_right" -%gconf_set /apps/notification-daemon/theme --type=string "slider" -# -# And generate default GNOME panel layout: -export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` -%gconf_load panel-default-setup.entries +#%%gconf_set /desktop/gnome/shell/windows/theme --type=string "Sonar" # # Merge is optional, but one larger file is better than many small files: gconf-merge-tree $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor @@ -433,11 +318,4 @@ %{_datadir}/sounds/novell/ %endif -%if ! %build_SLES - -%files -n gnome-panel-branding-SLED -%defattr(-,root,root) -%doc COPYING -%endif - %changelog ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.0xQzOt/_old 2011-07-08 11:31:57.000000000 +0200 +++ /var/tmp/diff_new_pack.0xQzOt/_new 2011-07-08 11:31:57.000000000 +0200 @@ -23,24 +23,21 @@ %if %build_openSUSE %define branding_name openSUSE +%define pkg_version 12.1 %define desktop_data openSUSE %define dynamic_file stripes/stripes.xml -%define desktop_data_ver 11.4 -%define wallpaper_file openSUSE-default.xml %endif # %%build_openSUSE %if %build_SLED %define branding_name SLED +%define pkg_version 11 %define desktop_data SLED -%define desktop_data_ver 11 %define dynamic_file nonexisting -%define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES %define branding_name SLES +%define pkg_version 11 %define desktop_data SLED -%define desktop_data_ver 11 %define dynamic_file nonexisting -%define wallpaper_file SLED110-1600x1200.png %endif # Do not edit this auto generated file! Edit gconf2-branding.spec.in. @@ -49,11 +46,10 @@ License: BSD3c(or similar) Group: System/GUI/GNOME Summary: SLES defaults for the GNOME configuration system -Version: %{desktop_data_ver} -Release: 10 +Version: %{pkg_version} +Release: 11 +Url: http://projects.gnome.org/gconf/ Source: gconf2-branding_spec-prepare.sh -# panel-default-setup.entries from gnome-panel (patched version): -Source2: panel-default-setup.entries Source3: gconf2-branding-COPYING %if %build_openSUSE # Launchers on the desktop @@ -74,34 +70,18 @@ Source31: novell-sound-desktop-login.ogg %endif Source99: HACKING -# 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 BuildRequires: desktop-data-%{desktop_data} BuildRequires: gconf2 +# For directory ownership of %{_datadir}/backgrounds: +# BuildRequires: gnome-themes %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) -BuildRequires: gnome-panel -%define gnome_panel_version %(rpm -q --qf '%%{version}-%%{release}' gnome-panel) +Requires: gconf2 = %{gconf2_version} Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) -Supplements: packageand(gnome-session:branding-SLES) -# For directory ownership of %{_datadir}/backgrounds: -# BuildRequires: gnome-themes +Supplements: packageand(gconf2:branding-SLES) #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. -PreReq: gconf2 -# Wallpaper -Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} -# Icon theme -Requires: sonar-icon-theme -# Metacity and gtk+ theme -Requires: gtk2-metatheme-sonar -# Cursor theme -Requires: dmz-icon-theme-cursors -# Window title font -Requires: fifth-leg-font %if %build_SLED || %build_SLES # Sound theme Requires: novell-sound-theme @@ -158,36 +138,13 @@ This packages provides the default sound theme by Novell. %endif -%if ! %build_SLES - -%package -n gnome-panel-branding-SLES -License: BSD3c(or similar) -Summary: SLES branding of gnome-panel -Group: System/GUI/GNOME -Requires: tomboy -Provides: gnome-panel-branding = %{gnome_panel_version} -Conflicts: otherproviders(gnome-panel-branding) -Supplements: packageand(gnome-panel:branding-SLES) -Supplements: packageand(gnome-panel:gconf2-branding-SLES) -BuildArch: noarch - -%description -n gnome-panel-branding-SLES -This package provides SLES Look and Feel for the GNOME -panel. -%endif - %prep %if %build_openSUSE %setup -q -T -a20 -a21 -a22 -a23 -a24 -c %{name}-%{version} %else %setup -q -T -c %{name}-%{version} %endif -cp -a %{S:2} . cp -a %{S:3} COPYING -%patch0 -%if %build_SLES -%patch1 -%endif %build %if %suse_version < 1140 @@ -244,111 +201,39 @@ %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: -# Note: please keep in sync the strings here with the strings added by -# gnome-control-center-shell-common-tasks-i18n.patch in gnome-control-center. -# Else, they won't be translated. -%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Change Look and Feel;gnome-appearance-properties.desktop,Set Preferred Applications;default-applications.desktop,Configure Printer;system-config-printer.desktop,Configure Network;nm-connection-editor.desktop,Edit Personal Information;gnome-about-me.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/11/" -%endif -# 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" # Icon used on gdm greeter %gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "distributor" # No user list in GDM for SLED/SLES %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "true" %endif -# Check if hardware drivers should be installed -%gconf_set /apps/gnome-packagekit/enable_check_hardware --type=bool "true" -# Depends on the gnome-power-manager-notify-idle-sleep.patch in g-p-m -%gconf_set /apps/gnome-power-manager/notify/idle_sleep --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_display_ac --type=int 300 -# To complete Energy Star compliant default configuration, you should enable this too: -# (disabled by default because suspending is not working fine in all cases) -#%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 -# Use gnome-wm as default window manager: -%gconf_set /desktop/gnome/session/required_components/windowmanager --type=string "gnome-wm" -# The PackageKit gtk+ module is too spammy, fdo#23917 -%gconf_set /apps/gnome_settings_daemon/gtk-modules/pk-gtk-module --type=bool "false" # Define default keybinding of gnome-settings-daemon: # FIX-OPENSUSE bnc#462640 vuntz@novell.com -- mute button always mute, instead of toggling %gconf_set /apps/gnome_settings_daemon/toggle_mute --type=bool "FALSE" -# FIX-OPENSUSE gnome-settings-daemon-default-config.patch -%gconf_set /apps/gnome_settings_daemon/keybindings/help --type=string "XF86Help" -# Set keyboard layout global per session instead of per window -# FIX-OPENSUSE bnc#540014 dimstar@opensuse.org -- Global keyboard layout instead of per window. -%gconf_set /desktop/gnome/peripherals/keyboard/general/groupPerWindow --type=bool "false" -# Enable xrandr notification by default bnc#440868 rodrigo@novell.com -%gconf_set /apps/gnome_settings_daemon/xrandr/show_notification_icon --type=bool "TRUE" -# 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" # Do not retain PK authorizations by default (bnc#431569) lnussel@suse.de %gconf_set /desktop/gnome/policykit/auth_dialog_retain_authorization --type=bool "false" -# Use firefox, not epiphany for all apps handled by gnome-vfs2 and libgnome (keep inactive for ftp). This is not needed anymore strictly speaking, with the move to x-scheme-handler, but Firefox still checks for those keys and some apps might do the same: +# This is not needed anymore strictly speaking, with the move to x-scheme-handler, but Firefox still checks for those keys and some apps might do the same: %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" -# Change default look of GNOME in libgnome: -# Change default background (scriptlets may alter this value): -test -f %{_datadir}/wallpapers/%{wallpaper_file} -# WARNING: Don't forget to change value in scriptlets below: -%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" -%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 "Sonar" -%gconf_set /desktop/gnome/interface/accessibility --type=bool "false" -%gconf_set /desktop/gnome/interface/icon_theme --type=string "Sonar" -# 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 "Sonar" -# WARNING: make sure this is the default theme that is also used in /var/adm/fillup-templates/sysconfig.windowmanager-desktop-data-openSUSE from desktop-data-openSUSE -%gconf_set /desktop/gnome/peripherals/mouse/cursor_theme --type=string "DMZ" -# 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" -%if %build_SLED || %build_SLES -%gconf_set /desktop/gnome/sound/theme_name --type=string "novell" -%endif # 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 +# We want to use pulseaudio by default; this makes empathy calls work better +%gconf_set /system/gstreamer/0.10/default/audiosrc --type=string "pulsesrc" +## Disabled since we don't have any other good theme than the upstream one for GNOME 3 # Change default theme in Metacity: -%gconf_set /apps/metacity/general/theme --type=string "Sonar" -%gconf_set /apps/metacity/general/titlebar_font --type=string "FifthLeg Bold 12" +#%%gconf_set /apps/metacity/general/theme --type=string "Sonar" +#%%gconf_set /apps/metacity/general/titlebar_font --type=string "FifthLeg Bold 12" # Change default theme in GNOME Shell: -%gconf_set /desktop/gnome/shell/windows/theme --type=string "Sonar" -# 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/popup_location --type=string "bottom_right" -%gconf_set /apps/notification-daemon/theme --type=string "slider" -# -# And generate default GNOME panel layout: -export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` -%gconf_load panel-default-setup.entries +#%%gconf_set /desktop/gnome/shell/windows/theme --type=string "Sonar" # # Merge is optional, but one larger file is better than many small files: gconf-merge-tree $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor @@ -433,11 +318,4 @@ %{_datadir}/sounds/novell/ %endif -%if ! %build_SLES - -%files -n gnome-panel-branding-SLES -%defattr(-,root,root) -%doc COPYING -%endif - %changelog ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.0xQzOt/_old 2011-07-08 11:31:57.000000000 +0200 +++ /var/tmp/diff_new_pack.0xQzOt/_new 2011-07-08 11:31:57.000000000 +0200 @@ -23,24 +23,21 @@ %if %build_openSUSE %define branding_name openSUSE +%define pkg_version 12.1 %define desktop_data openSUSE %define dynamic_file stripes/stripes.xml -%define desktop_data_ver 11.4 -%define wallpaper_file openSUSE-default.xml %endif # %%build_openSUSE %if %build_SLED %define branding_name SLED +%define pkg_version 11 %define desktop_data SLED -%define desktop_data_ver 11 %define dynamic_file nonexisting -%define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES %define branding_name SLES +%define pkg_version 11 %define desktop_data SLED -%define desktop_data_ver 11 %define dynamic_file nonexisting -%define wallpaper_file SLED110-1600x1200.png %endif # Do not edit this auto generated file! Edit gconf2-branding.spec.in. @@ -49,11 +46,10 @@ License: BSD3c(or similar) Group: System/GUI/GNOME Summary: openSUSE defaults for the GNOME configuration system -Version: %{desktop_data_ver} -Release: 17 +Version: %{pkg_version} +Release: 1 +Url: http://projects.gnome.org/gconf/ Source: gconf2-branding_spec-prepare.sh -# panel-default-setup.entries from gnome-panel (patched version): -Source2: panel-default-setup.entries Source3: gconf2-branding-COPYING %if %build_openSUSE # Launchers on the desktop @@ -74,34 +70,18 @@ Source31: novell-sound-desktop-login.ogg %endif Source99: HACKING -# 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 BuildRequires: desktop-data-%{desktop_data} BuildRequires: gconf2 +# For directory ownership of %{_datadir}/backgrounds: +# BuildRequires: gnome-themes %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) -BuildRequires: gnome-panel -%define gnome_panel_version %(rpm -q --qf '%%{version}-%%{release}' gnome-panel) +Requires: gconf2 = %{gconf2_version} Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) -Supplements: packageand(gnome-session:branding-openSUSE) -# For directory ownership of %{_datadir}/backgrounds: -# BuildRequires: gnome-themes +Supplements: packageand(gconf2:branding-openSUSE) #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. -PreReq: gconf2 -# Wallpaper -Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} -# Icon theme -Requires: sonar-icon-theme -# Metacity and gtk+ theme -Requires: gtk2-metatheme-sonar -# Cursor theme -Requires: dmz-icon-theme-cursors -# Window title font -Requires: fifth-leg-font %if %build_SLED || %build_SLES # Sound theme Requires: novell-sound-theme @@ -158,36 +138,13 @@ This packages provides the default sound theme by Novell. %endif -%if ! %build_SLES - -%package -n gnome-panel-branding-openSUSE -License: BSD3c(or similar) -Summary: openSUSE branding of gnome-panel -Group: System/GUI/GNOME -Requires: tomboy -Provides: gnome-panel-branding = %{gnome_panel_version} -Conflicts: otherproviders(gnome-panel-branding) -Supplements: packageand(gnome-panel:branding-openSUSE) -Supplements: packageand(gnome-panel:gconf2-branding-openSUSE) -BuildArch: noarch - -%description -n gnome-panel-branding-openSUSE -This package provides openSUSE Look and Feel for the GNOME -panel. -%endif - %prep %if %build_openSUSE %setup -q -T -a20 -a21 -a22 -a23 -a24 -c %{name}-%{version} %else %setup -q -T -c %{name}-%{version} %endif -cp -a %{S:2} . cp -a %{S:3} COPYING -%patch0 -%if %build_SLES -%patch1 -%endif %build %if %suse_version < 1140 @@ -244,111 +201,39 @@ %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: -# Note: please keep in sync the strings here with the strings added by -# gnome-control-center-shell-common-tasks-i18n.patch in gnome-control-center. -# Else, they won't be translated. -%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Change Look and Feel;gnome-appearance-properties.desktop,Set Preferred Applications;default-applications.desktop,Configure Printer;system-config-printer.desktop,Configure Network;nm-connection-editor.desktop,Edit Personal Information;gnome-about-me.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/11/" -%endif -# 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" # Icon used on gdm greeter %gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "distributor" # No user list in GDM for SLED/SLES %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "true" %endif -# Check if hardware drivers should be installed -%gconf_set /apps/gnome-packagekit/enable_check_hardware --type=bool "true" -# Depends on the gnome-power-manager-notify-idle-sleep.patch in g-p-m -%gconf_set /apps/gnome-power-manager/notify/idle_sleep --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_display_ac --type=int 300 -# To complete Energy Star compliant default configuration, you should enable this too: -# (disabled by default because suspending is not working fine in all cases) -#%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 -# Use gnome-wm as default window manager: -%gconf_set /desktop/gnome/session/required_components/windowmanager --type=string "gnome-wm" -# The PackageKit gtk+ module is too spammy, fdo#23917 -%gconf_set /apps/gnome_settings_daemon/gtk-modules/pk-gtk-module --type=bool "false" # Define default keybinding of gnome-settings-daemon: # FIX-OPENSUSE bnc#462640 vuntz@novell.com -- mute button always mute, instead of toggling %gconf_set /apps/gnome_settings_daemon/toggle_mute --type=bool "FALSE" -# FIX-OPENSUSE gnome-settings-daemon-default-config.patch -%gconf_set /apps/gnome_settings_daemon/keybindings/help --type=string "XF86Help" -# Set keyboard layout global per session instead of per window -# FIX-OPENSUSE bnc#540014 dimstar@opensuse.org -- Global keyboard layout instead of per window. -%gconf_set /desktop/gnome/peripherals/keyboard/general/groupPerWindow --type=bool "false" -# Enable xrandr notification by default bnc#440868 rodrigo@novell.com -%gconf_set /apps/gnome_settings_daemon/xrandr/show_notification_icon --type=bool "TRUE" -# 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" # Do not retain PK authorizations by default (bnc#431569) lnussel@suse.de %gconf_set /desktop/gnome/policykit/auth_dialog_retain_authorization --type=bool "false" -# Use firefox, not epiphany for all apps handled by gnome-vfs2 and libgnome (keep inactive for ftp). This is not needed anymore strictly speaking, with the move to x-scheme-handler, but Firefox still checks for those keys and some apps might do the same: +# This is not needed anymore strictly speaking, with the move to x-scheme-handler, but Firefox still checks for those keys and some apps might do the same: %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" -# Change default look of GNOME in libgnome: -# Change default background (scriptlets may alter this value): -test -f %{_datadir}/wallpapers/%{wallpaper_file} -# WARNING: Don't forget to change value in scriptlets below: -%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" -%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 "Sonar" -%gconf_set /desktop/gnome/interface/accessibility --type=bool "false" -%gconf_set /desktop/gnome/interface/icon_theme --type=string "Sonar" -# 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 "Sonar" -# WARNING: make sure this is the default theme that is also used in /var/adm/fillup-templates/sysconfig.windowmanager-desktop-data-openSUSE from desktop-data-openSUSE -%gconf_set /desktop/gnome/peripherals/mouse/cursor_theme --type=string "DMZ" -# 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" -%if %build_SLED || %build_SLES -%gconf_set /desktop/gnome/sound/theme_name --type=string "novell" -%endif # 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 +# We want to use pulseaudio by default; this makes empathy calls work better +%gconf_set /system/gstreamer/0.10/default/audiosrc --type=string "pulsesrc" +## Disabled since we don't have any other good theme than the upstream one for GNOME 3 # Change default theme in Metacity: -%gconf_set /apps/metacity/general/theme --type=string "Sonar" -%gconf_set /apps/metacity/general/titlebar_font --type=string "FifthLeg Bold 12" +#%%gconf_set /apps/metacity/general/theme --type=string "Sonar" +#%%gconf_set /apps/metacity/general/titlebar_font --type=string "FifthLeg Bold 12" # Change default theme in GNOME Shell: -%gconf_set /desktop/gnome/shell/windows/theme --type=string "Sonar" -# 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/popup_location --type=string "bottom_right" -%gconf_set /apps/notification-daemon/theme --type=string "slider" -# -# And generate default GNOME panel layout: -export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` -%gconf_load panel-default-setup.entries +#%%gconf_set /desktop/gnome/shell/windows/theme --type=string "Sonar" # # Merge is optional, but one larger file is better than many small files: gconf-merge-tree $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor @@ -433,11 +318,4 @@ %{_datadir}/sounds/novell/ %endif -%if ! %build_SLES - -%files -n gnome-panel-branding-openSUSE -%defattr(-,root,root) -%doc COPYING -%endif - %changelog ++++++ gconf2-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.0xQzOt/_old 2011-07-08 11:31:57.000000000 +0200 +++ /var/tmp/diff_new_pack.0xQzOt/_new 2011-07-08 11:31:57.000000000 +0200 @@ -1,4 +1,87 @@ ------------------------------------------------------------------- +Fri Jul 1 18:14:36 CEST 2011 - vuntz@opensuse.org + +- Completely drop panel layout branding, as this is not handled in + gconf anymore: + + Drop panel-default-setup.entries source file. + + Drop gnome-panel-layout.patch, gnome-panel-layout-SLES.patch. + + Remove gnome-panel-branding-%{branding_name} subpackage. + + Remove gnome-panel BuildRequires. +- Remove default values for keys that are moved to GSettings (and + set in the new gio-branding-openSUSE), as part of bnc#676301 and + bnc#687780: + + /apps/epiphany/general/homepage + + /schemas/apps/window_list_applet/prefs/display_all_workspaces + + /apps/gnome-power-manager/actions/sleep_type_battery + + /apps/gnome-power-manager/notify/idle_sleep + + /apps/gnome-power-manager/timeout/sleep_display_ac + + /apps/gnome-power-manager/timeout/sleep_computer_battery + + /apps/gnome-power-manager/timeout/sleep_computer_ac + + /apps/gnome_settings_daemon/gtk-modules/pk-gtk-module + + /apps/gnome_settings_daemon/keybindings/help + + /desktop/gnome/peripherals/keyboard/general/groupPerWindow + + /desktop/gnome/background/picture_filename + + /desktop/gnome/background/picture_options + + /desktop/gnome/background/primary_color + + /desktop/gnome/background/secondary_color + + /desktop/gnome/interface/accessibility + + /desktop/gnome/interface/icon_theme + + /desktop/gnome/interface/gtk_theme + + /desktop/gnome/peripherals/mouse/cursor_theme + + /desktop/gnome/sound/event_sounds + + /desktop/gnome/sound/theme_name + + /apps/nautilus/preferences/preview_sound +- Remove default values that are now obsolete: + + /apps/control-center/cc_actions_list: the control center has + completely changed, and has nothing similar anymore + + /apps/gnome-packagekit/enable_check_hardware: + gnome-settings-daemon always checks for hardware now (and uses + udev instead of hal) + + /desktop/gnome/session/required_components/windowmanager: + this is now defined in gnome-session .session files. We used + gnome-wm to easily allow the use of compiz; now compiz should + provide a .session file (bnc#676360) + + /apps/gnome_settings_daemon/xrandr/show_notification_icon: + there is no such xrandr notification icon anymore + + /apps/procman/proctree/col_15_visible: the memory column in the + system monitor is now giving reasonable values, so we don't + need to hide it by default anymore + + /desktop/gnome/url-handlers/ftp/command, + /desktop/gnome/applications/browser/exec: this is now handled + with the MIME type system, (with + x-scheme-handler/{http,https,ftp} MIME types). Note that we + keep /desktop/gnome/url-handlers/http/command and + /desktop/gnome/url-handlers/https/command, but only because + Firefox looks at them to know if it's the default browser. + + /desktop/gnome/file_views/icon_theme: there is no such key + anymore (the general icon theme is used, I think) + + /desktop/gnome/sound/enable_esd: esound is not used anymore + + /apps/nautilus/desktop/computer_icon_visible: we don't show the + desktop by default anymore, so no need to change this + + /apps/notification-daemon/popup_location, + /apps/notification-daemon/theme: notification-daemon is not + configurable anymore +- Stop changing window theme-related keys, as we do not have any + other good theme than the upstream one for GNOME 3, right now: + + /apps/metacity/general/theme + + /apps/metacity/general/titlebar_font + + /desktop/gnome/shell/windows/theme +- Set /system/gstreamer/0.10/default/audiosrc to pulsesrc, as we + use PulseAudio. This makes empathy calls work better. +- Remove Requires that are related to gconf keys removed above: + desktop-data-%{desktop_data}, sonar-icon-theme, + gtk2-metatheme-sonar, dmz-icon-theme-cursors, fifth-leg-font. +- Change back Supplements from + packageand(gnome-session:branding-%{branding_name}) to + packageand(gconf2:branding-%{branding_name}) as there is no + Requires anymore for the branding package, and so it's no issue + to have this package installed in non-GNOME setups. +- Add a Requires for gconf2, since the branding package is useless + without it. Remove gconf2 PreReq, since we don't need gconf2 + before installation. +- Add Url tag. + +------------------------------------------------------------------- Fri Feb 25 11:03:12 CET 2011 - vuntz@opensuse.org - Update gnome-panel-layout.patch: make sure there is no empty ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.0xQzOt/_old 2011-07-08 11:31:57.000000000 +0200 +++ /var/tmp/diff_new_pack.0xQzOt/_new 2011-07-08 11:31:57.000000000 +0200 @@ -23,35 +23,31 @@ %if %build_openSUSE %define branding_name openSUSE +%define pkg_version 12.1 %define desktop_data openSUSE -%define dynamic_file stripes/stripes.xml -%define desktop_data_ver 11.4 -%define wallpaper_file openSUSE-default.xml +%define dynamic_file stripes/stripes.xml %endif # %%build_openSUSE %if %build_SLED %define branding_name SLED +%define pkg_version 11 %define desktop_data SLED -%define desktop_data_ver 11 -%define dynamic_file nonexisting -%define wallpaper_file SLED110-1600x1200.png +%define dynamic_file nonexisting %endif %if %build_SLES %define branding_name SLES +%define pkg_version 11 %define desktop_data SLED -%define desktop_data_ver 11 -%define dynamic_file nonexisting -%define wallpaper_file SLED110-1600x1200.png +%define dynamic_file nonexisting %endif Name: gconf2-branding-%{branding_name} License: BSD3c(or similar) Group: System/GUI/GNOME Summary: %{branding_name} defaults for the GNOME configuration system -Version: %{desktop_data_ver} +Version: %{pkg_version} Release: 1 +Url: http://projects.gnome.org/gconf/ Source: gconf2-branding_spec-prepare.sh -# panel-default-setup.entries from gnome-panel (patched version): -Source2: panel-default-setup.entries Source3: gconf2-branding-COPYING %if %build_openSUSE # Launchers on the desktop @@ -72,34 +68,18 @@ Source31: novell-sound-desktop-login.ogg %endif Source99: HACKING -# 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 BuildRequires: desktop-data-%{desktop_data} BuildRequires: gconf2 +# For directory ownership of %{_datadir}/backgrounds: +# BuildRequires: gnome-themes %define gconf2_version %(rpm -q --qf '%%{version}-%%{release}' gconf2) -BuildRequires: gnome-panel -%define gnome_panel_version %(rpm -q --qf '%%{version}-%%{release}' gnome-panel) +Requires: gconf2 = %{gconf2_version} Provides: gconf2-branding = %{gconf2_version} Conflicts: otherproviders(gconf2-branding) -Supplements: packageand(gnome-session:branding-%{branding_name}) -# For directory ownership of %{_datadir}/backgrounds: -# BuildRequires: gnome-themes +Supplements: packageand(gconf2:branding-%{branding_name}) #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. -PreReq: gconf2 -# Wallpaper -Requires: desktop-data-%{desktop_data} = %{desktop_data_ver} -# Icon theme -Requires: sonar-icon-theme -# Metacity and gtk+ theme -Requires: gtk2-metatheme-sonar -# Cursor theme -Requires: dmz-icon-theme-cursors -# Window title font -Requires: fifth-leg-font %if %build_SLED || %build_SLES # Sound theme Requires: novell-sound-theme @@ -154,35 +134,13 @@ This packages provides the default sound theme by Novell. %endif -%if ! %build_SLES -%package -n gnome-panel-branding-%{branding_name} -License: BSD3c(or similar) -Summary: %{branding_name} branding of gnome-panel -Group: System/GUI/GNOME -Requires: tomboy -Provides: gnome-panel-branding = %{gnome_panel_version} -Conflicts: otherproviders(gnome-panel-branding) -Supplements: packageand(gnome-panel:branding-%{branding_name}) -Supplements: packageand(gnome-panel:gconf2-branding-%{branding_name}) -BuildArch: noarch - -%description -n gnome-panel-branding-%{branding_name} -This package provides %{branding_name} Look and Feel for the GNOME -panel. -%endif - %prep %if %build_openSUSE %setup -q -T -a20 -a21 -a22 -a23 -a24 -c %{name}-%{version} %else %setup -q -T -c %{name}-%{version} %endif -cp -a %{S:2} . cp -a %{S:3} COPYING -%patch0 -%if %build_SLES -%patch1 -%endif %build %if %suse_version < 1140 @@ -239,111 +197,39 @@ %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: -# Note: please keep in sync the strings here with the strings added by -# gnome-control-center-shell-common-tasks-i18n.patch in gnome-control-center. -# Else, they won't be translated. -%gconf_set /apps/control-center/cc_actions_list --type=list --list-type=string "[Change Look and Feel;gnome-appearance-properties.desktop,Set Preferred Applications;default-applications.desktop,Configure Printer;system-config-printer.desktop,Configure Network;nm-connection-editor.desktop,Edit Personal Information;gnome-about-me.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/11/" -%endif -# 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" # Icon used on gdm greeter %gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "distributor" # No user list in GDM for SLED/SLES %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "true" %endif -# Check if hardware drivers should be installed -%gconf_set /apps/gnome-packagekit/enable_check_hardware --type=bool "true" -# Depends on the gnome-power-manager-notify-idle-sleep.patch in g-p-m -%gconf_set /apps/gnome-power-manager/notify/idle_sleep --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_display_ac --type=int 300 -# To complete Energy Star compliant default configuration, you should enable this too: -# (disabled by default because suspending is not working fine in all cases) -#%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 -# Use gnome-wm as default window manager: -%gconf_set /desktop/gnome/session/required_components/windowmanager --type=string "gnome-wm" -# The PackageKit gtk+ module is too spammy, fdo#23917 -%gconf_set /apps/gnome_settings_daemon/gtk-modules/pk-gtk-module --type=bool "false" # Define default keybinding of gnome-settings-daemon: # FIX-OPENSUSE bnc#462640 vuntz@novell.com -- mute button always mute, instead of toggling %gconf_set /apps/gnome_settings_daemon/toggle_mute --type=bool "FALSE" -# FIX-OPENSUSE gnome-settings-daemon-default-config.patch -%gconf_set /apps/gnome_settings_daemon/keybindings/help --type=string "XF86Help" -# Set keyboard layout global per session instead of per window -# FIX-OPENSUSE bnc#540014 dimstar@opensuse.org -- Global keyboard layout instead of per window. -%gconf_set /desktop/gnome/peripherals/keyboard/general/groupPerWindow --type=bool "false" -# Enable xrandr notification by default bnc#440868 rodrigo@novell.com -%gconf_set /apps/gnome_settings_daemon/xrandr/show_notification_icon --type=bool "TRUE" -# 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" # Do not retain PK authorizations by default (bnc#431569) lnussel@suse.de %gconf_set /desktop/gnome/policykit/auth_dialog_retain_authorization --type=bool "false" -# Use firefox, not epiphany for all apps handled by gnome-vfs2 and libgnome (keep inactive for ftp). This is not needed anymore strictly speaking, with the move to x-scheme-handler, but Firefox still checks for those keys and some apps might do the same: +# This is not needed anymore strictly speaking, with the move to x-scheme-handler, but Firefox still checks for those keys and some apps might do the same: %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" -# Change default look of GNOME in libgnome: -# Change default background (scriptlets may alter this value): -test -f %{_datadir}/wallpapers/%{wallpaper_file} -# WARNING: Don't forget to change value in scriptlets below: -%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" -%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 "Sonar" -%gconf_set /desktop/gnome/interface/accessibility --type=bool "false" -%gconf_set /desktop/gnome/interface/icon_theme --type=string "Sonar" -# WARNING: gtk2-branding-%{branding_name} must contain the same, otherwise it -# will change when gnome-settings-daemon starts: -%gconf_set /desktop/gnome/interface/gtk_theme --type=string "Sonar" -# WARNING: make sure this is the default theme that is also used in /var/adm/fillup-templates/sysconfig.windowmanager-desktop-data-openSUSE from desktop-data-openSUSE -%gconf_set /desktop/gnome/peripherals/mouse/cursor_theme --type=string "DMZ" -# 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" -%if %build_SLED || %build_SLES -%gconf_set /desktop/gnome/sound/theme_name --type=string "novell" -%endif # 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 +# We want to use pulseaudio by default; this makes empathy calls work better +%gconf_set /system/gstreamer/0.10/default/audiosrc --type=string "pulsesrc" +## Disabled since we don't have any other good theme than the upstream one for GNOME 3 # Change default theme in Metacity: -%gconf_set /apps/metacity/general/theme --type=string "Sonar" -%gconf_set /apps/metacity/general/titlebar_font --type=string "FifthLeg Bold 12" +#%%gconf_set /apps/metacity/general/theme --type=string "Sonar" +#%%gconf_set /apps/metacity/general/titlebar_font --type=string "FifthLeg Bold 12" # Change default theme in GNOME Shell: -%gconf_set /desktop/gnome/shell/windows/theme --type=string "Sonar" -# 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/popup_location --type=string "bottom_right" -%gconf_set /apps/notification-daemon/theme --type=string "slider" -# -# And generate default GNOME panel layout: -export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source` -%gconf_load panel-default-setup.entries +#%%gconf_set /desktop/gnome/shell/windows/theme --type=string "Sonar" # # Merge is optional, but one larger file is better than many small files: gconf-merge-tree $RPM_BUILD_ROOT%{_sysconfdir}/gconf/gconf.xml.vendor @@ -426,10 +312,4 @@ %{_datadir}/sounds/novell/ %endif -%if ! %build_SLES -%files -n gnome-panel-branding-%{branding_name} -%defattr(-,root,root) -%doc COPYING -%endif - %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org