Hello community, here is the log from the commit of package gconf2-branding-openSUSE checked in at Mon Nov 10 00:23:12 CET 2008. -------- --- gconf2-branding-openSUSE/gconf2-branding.changes 2008-11-07 17:07:28.000000000 +0100 +++ /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gconf2-branding.changes 2008-11-09 17:12:02.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Nov 9 17:10:20 CET 2008 - vuntz@novell.com + +- Rename suse icons to gdm-suse to avoid conflict with + yast2-theme-openSUSE. + +------------------------------------------------------------------- gconf2-branding-openSUSE.changes: same change gconf2-branding-SLED.changes: same change gconf2-branding-SLES.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.c18945/_old 2008-11-10 00:22:33.000000000 +0100 +++ /var/tmp/diff_new_pack.c18945/_new 2008-11-10 00:22:33.000000000 +0100 @@ -42,7 +42,7 @@ Group: System/GUI/GNOME Summary: GNOME configuration system: openSUSE defaults Version: 2.24 -Release: 10 +Release: 11 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gconf2-branding_spec-prepare.sh @@ -92,7 +92,7 @@ Summary: Dynamic Wallpaper with openSUSE Look Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 3 +Release: 4 %description -n desktop-data-openSUSE-extra-gnome This optional package contains nice dynamic wallpaper with openSUSE @@ -155,7 +155,7 @@ # 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 "suse" +%gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "gdm-suse" # No user list in GDM for SLED/SLES %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "false" @@ -253,12 +253,12 @@ # Compatibility: We cannot move these icons to another location without # providing an homedir update process: install -m 0644 %{S:8} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ -ln -s %{_datadir}/icons/hicolor/scalable/apps/suse.svg $RPM_BUILD_ROOT%{_datadir}/dist/icons/suse.svg +ln -s %{_datadir}/icons/hicolor/scalable/apps/gdm-suse.svg $RPM_BUILD_ROOT%{_datadir}/dist/icons/suse.svg %endif for size in 16 22 32 48; do - install -D -m 0755 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/suse.png + install -D -m 0755 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/gdm-suse.png done -install -D -m 0755 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/suse.svg +install -D -m 0755 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/gdm-suse.svg %clean rm -rf $RPM_BUILD_ROOT @@ -319,6 +319,9 @@ %dir %{_datadir}/gnome-background-properties %changelog +* Sun Nov 09 2008 vuntz@novell.com +- Rename suse icons to gdm-suse to avoid conflict with + yast2-theme-openSUSE. * Fri Nov 07 2008 vuntz@novell.com - Set /apps/gnome-power-manager/notify/idle_sleep to TRUE (moved the default from gnome-power-manager to here, so we are upstream ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.c18945/_old 2008-11-10 00:22:33.000000000 +0100 +++ /var/tmp/diff_new_pack.c18945/_new 2008-11-10 00:22:33.000000000 +0100 @@ -42,7 +42,7 @@ Group: System/GUI/GNOME Summary: SLED defaults for the GNOME configuration system Version: 2.24 -Release: 10 +Release: 11 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gconf2-branding_spec-prepare.sh @@ -92,7 +92,7 @@ Summary: SLED defaults for the GNOME configuration system Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 3 +Release: 4 %description -n desktop-data-SLED-extra-gnome This package provides SLED defaults for configurations based on GConf @@ -148,7 +148,7 @@ # 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 "suse" +%gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "gdm-suse" # No user list in GDM for SLED/SLES %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "false" @@ -246,12 +246,12 @@ # Compatibility: We cannot move these icons to another location without # providing an homedir update process: install -m 0644 %{S:8} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ -ln -s %{_datadir}/icons/hicolor/scalable/apps/suse.svg $RPM_BUILD_ROOT%{_datadir}/dist/icons/suse.svg +ln -s %{_datadir}/icons/hicolor/scalable/apps/gdm-suse.svg $RPM_BUILD_ROOT%{_datadir}/dist/icons/suse.svg %endif for size in 16 22 32 48; do - install -D -m 0755 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/suse.png + install -D -m 0755 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/gdm-suse.png done -install -D -m 0755 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/suse.svg +install -D -m 0755 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/gdm-suse.svg %clean rm -rf $RPM_BUILD_ROOT @@ -312,6 +312,9 @@ %dir %{_datadir}/gnome-background-properties %changelog +* Sun Nov 09 2008 vuntz@novell.com +- Rename suse icons to gdm-suse to avoid conflict with + yast2-theme-openSUSE. * Fri Nov 07 2008 vuntz@novell.com - Set /apps/gnome-power-manager/notify/idle_sleep to TRUE (moved the default from gnome-power-manager to here, so we are upstream ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.c18945/_old 2008-11-10 00:22:33.000000000 +0100 +++ /var/tmp/diff_new_pack.c18945/_new 2008-11-10 00:22:33.000000000 +0100 @@ -42,7 +42,7 @@ Group: System/GUI/GNOME Summary: SLES defaults for the GNOME configuration system Version: 2.24 -Release: 10 +Release: 11 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gconf2-branding_spec-prepare.sh @@ -92,7 +92,7 @@ Summary: SLES defaults for the GNOME configuration system Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 3 +Release: 4 %description -n desktop-data-SLES-extra-gnome This package provides SLES defaults for configurations based on GConf @@ -148,7 +148,7 @@ # 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 "suse" +%gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "gdm-suse" # No user list in GDM for SLED/SLES %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "false" @@ -246,12 +246,12 @@ # Compatibility: We cannot move these icons to another location without # providing an homedir update process: install -m 0644 %{S:8} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ -ln -s %{_datadir}/icons/hicolor/scalable/apps/suse.svg $RPM_BUILD_ROOT%{_datadir}/dist/icons/suse.svg +ln -s %{_datadir}/icons/hicolor/scalable/apps/gdm-suse.svg $RPM_BUILD_ROOT%{_datadir}/dist/icons/suse.svg %endif for size in 16 22 32 48; do - install -D -m 0755 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/suse.png + install -D -m 0755 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/gdm-suse.png done -install -D -m 0755 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/suse.svg +install -D -m 0755 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/gdm-suse.svg %clean rm -rf $RPM_BUILD_ROOT @@ -312,6 +312,9 @@ %dir %{_datadir}/gnome-background-properties %changelog +* Sun Nov 09 2008 vuntz@novell.com +- Rename suse icons to gdm-suse to avoid conflict with + yast2-theme-openSUSE. * Fri Nov 07 2008 vuntz@novell.com - Set /apps/gnome-power-manager/notify/idle_sleep to TRUE (moved the default from gnome-power-manager to here, so we are upstream ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.c18945/_old 2008-11-10 00:22:33.000000000 +0100 +++ /var/tmp/diff_new_pack.c18945/_new 2008-11-10 00:22:33.000000000 +0100 @@ -155,7 +155,7 @@ # 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 "suse" +%gconf_set /apps/gdm/simple-greeter/logo_icon_name --type=string "gdm-suse" # No user list in GDM for SLED/SLES %if %build_SLED || %build_SLES %gconf_set /apps/gdm/simple-greeter/disable_user_list --type=bool "false" @@ -253,12 +253,12 @@ # Compatibility: We cannot move these icons to another location without # providing an homedir update process: install -m 0644 %{S:8} $RPM_BUILD_ROOT%{_datadir}/dist/icons/ -ln -s %{_datadir}/icons/hicolor/scalable/apps/suse.svg $RPM_BUILD_ROOT%{_datadir}/dist/icons/suse.svg +ln -s %{_datadir}/icons/hicolor/scalable/apps/gdm-suse.svg $RPM_BUILD_ROOT%{_datadir}/dist/icons/suse.svg %endif for size in 16 22 32 48; do - install -D -m 0755 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/suse.png + install -D -m 0755 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/gdm-suse.png done -install -D -m 0755 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/suse.svg +install -D -m 0755 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/gdm-suse.svg %clean rm -rf $RPM_BUILD_ROOT ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org