Hello community, here is the log from the commit of package gconf2-branding-openSUSE for openSUSE:Factory checked in at Wed Dec 30 00:18:30 CET 2009. -------- --- gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2009-10-08 18:06:31.000000000 +0200 +++ /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2009-12-30 00:18:03.332584000 +0100 @@ -1,0 +2,10 @@ +Thu Dec 24 15:11:48 CET 2009 - vuntz@opensuse.org + +- Set /apps/control-center/cc_actions_list, to show different + favorite capplets in the control center shell. This changes need + a patch in gnome-control-center to make sure the strings get + translated. +- Do not change /apps/nautilus/preferences/always_use_browser: + upstream has changed to true now. + +------------------------------------------------------------------- gconf2-branding-SLES.changes: same change gconf2-branding-openSUSE.changes: same change gconf2-branding.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.fbrWbN/_old 2009-12-30 00:18:19.000000000 +0100 +++ /var/tmp/diff_new_pack.fbrWbN/_new 2009-12-30 00:18:19.000000000 +0100 @@ -41,11 +41,11 @@ # Do not edit this auto generated file! Edit gconf2-branding.spec.in. Name: gconf2-branding-SLED -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Group: System/GUI/GNOME Summary: SLED defaults for the GNOME configuration system Version: 2.28 -Release: 3 +Release: 4 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: gconf2 @@ -103,13 +103,13 @@ %package -n desktop-data-SLED-extra-gnome -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Enhances: gconf2-branding-SLED Supplements: desktop-data-%{desktop_data}-extra Summary: Dynamic Wallpaper with SLED Look Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 8 +Release: 9 %description -n desktop-data-SLED-extra-gnome This optional package contains nice dynamic wallpaper with SLED @@ -155,8 +155,10 @@ %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;system-config-printer.desktop,Configure Network;nm-connection-editor.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]" +# 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/" @@ -248,9 +250,6 @@ # 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" -# 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: ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.fbrWbN/_old 2009-12-30 00:18:19.000000000 +0100 +++ /var/tmp/diff_new_pack.fbrWbN/_new 2009-12-30 00:18:19.000000000 +0100 @@ -41,11 +41,11 @@ # Do not edit this auto generated file! Edit gconf2-branding.spec.in. Name: gconf2-branding-SLES -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Group: System/GUI/GNOME Summary: SLES defaults for the GNOME configuration system Version: 2.28 -Release: 3 +Release: 4 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: gconf2 @@ -103,13 +103,13 @@ %package -n desktop-data-SLES-extra-gnome -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Enhances: gconf2-branding-SLES Supplements: desktop-data-%{desktop_data}-extra Summary: Dynamic Wallpaper with SLES Look Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 8 +Release: 9 %description -n desktop-data-SLES-extra-gnome This optional package contains nice dynamic wallpaper with SLES @@ -155,8 +155,10 @@ %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;system-config-printer.desktop,Configure Network;nm-connection-editor.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]" +# 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/" @@ -248,9 +250,6 @@ # 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" -# 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: ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.fbrWbN/_old 2009-12-30 00:18:19.000000000 +0100 +++ /var/tmp/diff_new_pack.fbrWbN/_new 2009-12-30 00:18:19.000000000 +0100 @@ -41,11 +41,11 @@ # Do not edit this auto generated file! Edit gconf2-branding.spec.in. Name: gconf2-branding-openSUSE -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Group: System/GUI/GNOME Summary: openSUSE defaults for the GNOME configuration system Version: 2.28 -Release: 3 +Release: 4 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: gconf2 @@ -103,13 +103,13 @@ %package -n desktop-data-openSUSE-extra-gnome -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Enhances: gconf2-branding-openSUSE Supplements: desktop-data-%{desktop_data}-extra Summary: Dynamic Wallpaper with openSUSE Look Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 8 +Release: 9 %description -n desktop-data-openSUSE-extra-gnome This optional package contains nice dynamic wallpaper with openSUSE @@ -155,8 +155,10 @@ %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;system-config-printer.desktop,Configure Network;nm-connection-editor.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]" +# 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/" @@ -248,9 +250,6 @@ # 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" -# 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: ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.fbrWbN/_old 2009-12-30 00:18:20.000000000 +0100 +++ /var/tmp/diff_new_pack.fbrWbN/_new 2009-12-30 00:18:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gconf2-branding-%{branding_name} (Version 2.26) +# spec file for package gconf2-branding-%{branding_name} (Version 2.28) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -155,8 +155,10 @@ %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;system-config-printer.desktop,Configure Network;nm-connection-editor.desktop,Change Password;gnome-passwd.desktop,Add User;YaST2/users.desktop,Open Administrator Settings;YaST.desktop]" +# 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/" @@ -248,9 +250,6 @@ # 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" -# 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: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org