Hello community, here is the log from the commit of package gconf2-branding-openSUSE for openSUSE:Factory checked in at 2012-03-16 13:13:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gconf2-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.gconf2-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gconf2-branding-openSUSE", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2011-10-13 16:25:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gconf2-branding-openSUSE.new/gconf2-branding-SLED.changes 2012-03-16 13:13:07.000000000 +0100 @@ -1,0 +2,21 @@ +Fri Mar 9 11:21:40 UTC 2012 - [email protected] + +- Remove system-wide desktop icons: + + This was done with a patch that won't get used anymore, see + discussion in bnc#533598. + + Drop GnomeOnlineHelp.desktop and suse-help.svg sources. + + Stop changing /apps/nautilus/desktop/predefined_items_dir. +- Update for metacity/mutter move to GSettings: + + Stop changing /apps/metacity/general/audible_bell. + + Remove commented entries for /apps/metacity/general/theme, + /apps/metacity/general/titlebar_font, + /desktop/gnome/shell/windows/theme. +- Update after drop of gnome-main-menu and move to GNOME 3 in + general: + + Stop changing + /apps/metacity/global_keybindings/panel_main_menu_list. +- Update after drop of PolicyKit-gnome: + + Stop changing + /desktop/gnome/policykit/auth_dialog_retain_authorization. + +------------------------------------------------------------------- gconf2-branding-SLES.changes: same change gconf2-branding-openSUSE.changes: same change Old: ---- GnomeOnlineHelp.desktop suse-help.svg ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.xIIj9f/_old 2012-03-16 13:13:14.000000000 +0100 +++ /var/tmp/diff_new_pack.xIIj9f/_new 2012-03-16 13:13:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gconf2-branding-SLED # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_openSUSE 0 %define build_SLED 1 @@ -35,21 +34,15 @@ %endif # Do not edit this auto generated file! Edit gconf2-branding.spec.in. - Name: gconf2-branding-SLED +Summary: SLED defaults for the GNOME configuration system License: BSD-3-Clause Group: System/GUI/GNOME -Summary: SLED defaults for the GNOME configuration system Version: %{pkg_version} -Release: 1 +Release: 0 Url: http://projects.gnome.org/gconf/ Source: gconf2-branding_spec-prepare.sh Source3: gconf2-branding-COPYING -%if %build_openSUSE -# Launchers on the desktop -Source10: GnomeOnlineHelp.desktop -Source11: suse-help.svg -%endif %if %build_SLED || %build_SLES # Novell sound theme Source30: novell-sound-index.theme @@ -79,9 +72,7 @@ on GConf database system. %if %build_SLED || %build_SLES - %package -n novell-sound-theme -License: BSD-3-Clause Summary: Novell Sound Theme Group: System/GUI/GNOME # the sound theme inherits from the freedesktop one @@ -120,45 +111,19 @@ %endif %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) [email protected] -%gconf_set /desktop/gnome/policykit/auth_dialog_retain_authorization --type=bool "false" # 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" # 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" -# 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" -# Change default theme in GNOME Shell: -#%%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 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 -d $RPM_BUILD_ROOT%{_datadir}/dist/icons -%if %build_openSUSE -install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ -# Compatibility: We cannot move these icons to another location without -# providing an homedir update process: -install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -167,16 +132,8 @@ %defattr(-,root,root) %doc COPYING %verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/* -%dir %{_datadir}/dist -%dir %{_datadir}/dist/desktop-files -%dir %{_datadir}/dist/icons -%if %build_openSUSE -%{_datadir}/dist/desktop-files/* -%{_datadir}/dist/icons/* -%endif %if %build_SLED || %build_SLES - %files -n novell-sound-theme %defattr(-,root,root) %doc COPYING ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.xIIj9f/_old 2012-03-16 13:13:14.000000000 +0100 +++ /var/tmp/diff_new_pack.xIIj9f/_new 2012-03-16 13:13:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gconf2-branding-SLES # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_openSUSE 0 %define build_SLED 0 @@ -35,21 +34,15 @@ %endif # Do not edit this auto generated file! Edit gconf2-branding.spec.in. - Name: gconf2-branding-SLES +Summary: SLES defaults for the GNOME configuration system License: BSD-3-Clause Group: System/GUI/GNOME -Summary: SLES defaults for the GNOME configuration system Version: %{pkg_version} -Release: 1 +Release: 0 Url: http://projects.gnome.org/gconf/ Source: gconf2-branding_spec-prepare.sh Source3: gconf2-branding-COPYING -%if %build_openSUSE -# Launchers on the desktop -Source10: GnomeOnlineHelp.desktop -Source11: suse-help.svg -%endif %if %build_SLED || %build_SLES # Novell sound theme Source30: novell-sound-index.theme @@ -79,9 +72,7 @@ on GConf database system. %if %build_SLED || %build_SLES - %package -n novell-sound-theme -License: BSD-3-Clause Summary: Novell Sound Theme Group: System/GUI/GNOME # the sound theme inherits from the freedesktop one @@ -120,45 +111,19 @@ %endif %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) [email protected] -%gconf_set /desktop/gnome/policykit/auth_dialog_retain_authorization --type=bool "false" # 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" # 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" -# 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" -# Change default theme in GNOME Shell: -#%%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 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 -d $RPM_BUILD_ROOT%{_datadir}/dist/icons -%if %build_openSUSE -install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ -# Compatibility: We cannot move these icons to another location without -# providing an homedir update process: -install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -167,16 +132,8 @@ %defattr(-,root,root) %doc COPYING %verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/* -%dir %{_datadir}/dist -%dir %{_datadir}/dist/desktop-files -%dir %{_datadir}/dist/icons -%if %build_openSUSE -%{_datadir}/dist/desktop-files/* -%{_datadir}/dist/icons/* -%endif %if %build_SLED || %build_SLES - %files -n novell-sound-theme %defattr(-,root,root) %doc COPYING ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.xIIj9f/_old 2012-03-16 13:13:14.000000000 +0100 +++ /var/tmp/diff_new_pack.xIIj9f/_new 2012-03-16 13:13:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gconf2-branding-openSUSE # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_openSUSE 1 %define build_SLED 0 @@ -35,21 +34,15 @@ %endif # Do not edit this auto generated file! Edit gconf2-branding.spec.in. - Name: gconf2-branding-openSUSE +Summary: openSUSE defaults for the GNOME configuration system License: BSD-3-Clause Group: System/GUI/GNOME -Summary: openSUSE defaults for the GNOME configuration system Version: %{pkg_version} -Release: 1 +Release: 0 Url: http://projects.gnome.org/gconf/ Source: gconf2-branding_spec-prepare.sh Source3: gconf2-branding-COPYING -%if %build_openSUSE -# Launchers on the desktop -Source10: GnomeOnlineHelp.desktop -Source11: suse-help.svg -%endif %if %build_SLED || %build_SLES # Novell sound theme Source30: novell-sound-index.theme @@ -79,9 +72,7 @@ on GConf database system. %if %build_SLED || %build_SLES - %package -n novell-sound-theme -License: BSD-3-Clause Summary: Novell Sound Theme Group: System/GUI/GNOME # the sound theme inherits from the freedesktop one @@ -120,45 +111,19 @@ %endif %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) [email protected] -%gconf_set /desktop/gnome/policykit/auth_dialog_retain_authorization --type=bool "false" # 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" # 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" -# 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" -# Change default theme in GNOME Shell: -#%%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 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 -d $RPM_BUILD_ROOT%{_datadir}/dist/icons -%if %build_openSUSE -install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ -# Compatibility: We cannot move these icons to another location without -# providing an homedir update process: -install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -167,16 +132,8 @@ %defattr(-,root,root) %doc COPYING %verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/* -%dir %{_datadir}/dist -%dir %{_datadir}/dist/desktop-files -%dir %{_datadir}/dist/icons -%if %build_openSUSE -%{_datadir}/dist/desktop-files/* -%{_datadir}/dist/icons/* -%endif %if %build_SLED || %build_SLES - %files -n novell-sound-theme %defattr(-,root,root) %doc COPYING ++++++ gconf2-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.xIIj9f/_old 2012-03-16 13:13:14.000000000 +0100 +++ /var/tmp/diff_new_pack.xIIj9f/_new 2012-03-16 13:13:14.000000000 +0100 @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Fri Mar 9 11:21:40 UTC 2012 - [email protected] + +- Remove system-wide desktop icons: + + This was done with a patch that won't get used anymore, see + discussion in bnc#533598. + + Drop GnomeOnlineHelp.desktop and suse-help.svg sources. + + Stop changing /apps/nautilus/desktop/predefined_items_dir. +- Update for metacity/mutter move to GSettings: + + Stop changing /apps/metacity/general/audible_bell. + + Remove commented entries for /apps/metacity/general/theme, + /apps/metacity/general/titlebar_font, + /desktop/gnome/shell/windows/theme. +- Update after drop of gnome-main-menu and move to GNOME 3 in + general: + + Stop changing + /apps/metacity/global_keybindings/panel_main_menu_list. +- Update after drop of PolicyKit-gnome: + + Stop changing + /desktop/gnome/policykit/auth_dialog_retain_authorization. + +------------------------------------------------------------------- Thu Oct 13 12:54:05 UTC 2011 - [email protected] - Remove %{release} from the gconf2 versioned Requires, to not ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.xIIj9f/_old 2012-03-16 13:13:14.000000000 +0100 +++ /var/tmp/diff_new_pack.xIIj9f/_new 2012-03-16 13:13:14.000000000 +0100 @@ -43,11 +43,6 @@ Url: http://projects.gnome.org/gconf/ Source: gconf2-branding_spec-prepare.sh Source3: gconf2-branding-COPYING -%if %build_openSUSE -# Launchers on the desktop -Source10: GnomeOnlineHelp.desktop -Source11: suse-help.svg -%endif %if %build_SLED || %build_SLES # Novell sound theme Source30: novell-sound-index.theme @@ -117,45 +112,19 @@ %endif %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) [email protected] -%gconf_set /desktop/gnome/policykit/auth_dialog_retain_authorization --type=bool "false" # 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" # 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" -# 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" -# Change default theme in GNOME Shell: -#%%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 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 -d $RPM_BUILD_ROOT%{_datadir}/dist/icons -%if %build_openSUSE -install -m 0644 %{S:10} $RPM_BUILD_ROOT%{_datadir}/dist/desktop-files/ -# Compatibility: We cannot move these icons to another location without -# providing an homedir update process: -install -m 0644 %{S:11} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ -%endif %clean rm -rf $RPM_BUILD_ROOT @@ -164,13 +133,6 @@ %defattr(-,root,root) %doc COPYING %verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/* -%dir %{_datadir}/dist -%dir %{_datadir}/dist/desktop-files -%dir %{_datadir}/dist/icons -%if %build_openSUSE -%{_datadir}/dist/desktop-files/* -%{_datadir}/dist/icons/* -%endif %if %build_SLED || %build_SLES %files -n novell-sound-theme -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
