Hello community, here is the log from the commit of package gconf2-branding-openSUSE checked in at Thu Oct 30 18:01:37 CET 2008. -------- --- gconf2-branding-openSUSE/gconf2-branding.changes 2008-10-22 19:41:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/gconf2-branding-openSUSE/gconf2-branding.changes 2008-10-30 17:32:56.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Oct 30 17:13:08 CET 2008 - vuntz@novell.com + +- Fix build for SLED/SLES: the filename of the default wallpaper + changed. + +------------------------------------------------------------------- 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.WV9885/_old 2008-10-30 18:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.WV9885/_new 2008-10-30 18:01:23.000000000 +0100 @@ -39,7 +39,7 @@ Group: System/GUI/GNOME Summary: GNOME configuration system: openSUSE defaults Version: 2.24 -Release: 5 +Release: 6 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gconf2-branding_spec-prepare.sh @@ -86,7 +86,7 @@ Summary: Dynamic Wallpaper with openSUSE Look Group: System/GUI/GNOME Version: 11.0.1 -Release: 77 +Release: 78 %description -n desktop-data-openSUSE-extra-gnome This optional package contains nice dynamic wallpaper with openSUSE @@ -187,9 +187,9 @@ %gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png" %endif %if %build_SLED || %build_SLES -test -f %{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg +test -f %{_datadir}/wallpapers/%{desktop_data}110-1600x1200.png # WARNING: Don't forget to change value in scriptlets below: -%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg" +%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.png" %endif %gconf_set /desktop/gnome/background/picture_options --type=string "stretched" %gconf_set /desktop/gnome/background/primary_color --type=string "#258c06" @@ -256,7 +256,7 @@ %endif %if %build_SLED || %build_SLES gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg" + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.png" %endif fi @@ -291,6 +291,9 @@ %dir %{_datadir}/gnome-background-properties %changelog +* Thu Oct 30 2008 vuntz@novell.com +- Fix build for SLED/SLES: the filename of the default wallpaper + changed. * Wed Oct 22 2008 vuntz@suse.de - Only install GnomeOnlineHelp.desktop and SuSE.desktop in /usr/share/dist/desktop-files for openSUSE. ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.WV9885/_old 2008-10-30 18:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.WV9885/_new 2008-10-30 18:01:23.000000000 +0100 @@ -39,7 +39,7 @@ Group: System/GUI/GNOME Summary: SLED defaults for the GNOME configuration system Version: 2.24 -Release: 5 +Release: 6 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gconf2-branding_spec-prepare.sh @@ -86,7 +86,7 @@ Summary: SLED defaults for the GNOME configuration system Group: System/GUI/GNOME Version: 11.0.1 -Release: 17 +Release: 18 %description -n desktop-data-SLED-extra-gnome This package provides SLED defaults for configurations based on GConf @@ -180,9 +180,9 @@ %gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png" %endif %if %build_SLED || %build_SLES -test -f %{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg +test -f %{_datadir}/wallpapers/%{desktop_data}110-1600x1200.png # WARNING: Don't forget to change value in scriptlets below: -%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg" +%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.png" %endif %gconf_set /desktop/gnome/background/picture_options --type=string "stretched" %gconf_set /desktop/gnome/background/primary_color --type=string "#258c06" @@ -249,7 +249,7 @@ %endif %if %build_SLED || %build_SLES gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg" + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.png" %endif fi @@ -284,6 +284,9 @@ %dir %{_datadir}/gnome-background-properties %changelog +* Thu Oct 30 2008 vuntz@novell.com +- Fix build for SLED/SLES: the filename of the default wallpaper + changed. * Wed Oct 22 2008 vuntz@suse.de - Only install GnomeOnlineHelp.desktop and SuSE.desktop in /usr/share/dist/desktop-files for openSUSE. ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.WV9885/_old 2008-10-30 18:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.WV9885/_new 2008-10-30 18:01:23.000000000 +0100 @@ -39,7 +39,7 @@ Group: System/GUI/GNOME Summary: SLES defaults for the GNOME configuration system Version: 2.24 -Release: 5 +Release: 6 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: gconf2-branding_spec-prepare.sh @@ -86,7 +86,7 @@ Summary: SLES defaults for the GNOME configuration system Group: System/GUI/GNOME Version: 11.0.1 -Release: 7 +Release: 8 %description -n desktop-data-SLES-extra-gnome This package provides SLES defaults for configurations based on GConf @@ -180,9 +180,9 @@ %gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png" %endif %if %build_SLED || %build_SLES -test -f %{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg +test -f %{_datadir}/wallpapers/%{desktop_data}110-1600x1200.png # WARNING: Don't forget to change value in scriptlets below: -%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg" +%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.png" %endif %gconf_set /desktop/gnome/background/picture_options --type=string "stretched" %gconf_set /desktop/gnome/background/primary_color --type=string "#258c06" @@ -249,7 +249,7 @@ %endif %if %build_SLED || %build_SLES gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg" + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.png" %endif fi @@ -284,6 +284,9 @@ %dir %{_datadir}/gnome-background-properties %changelog +* Thu Oct 30 2008 vuntz@novell.com +- Fix build for SLED/SLES: the filename of the default wallpaper + changed. * Wed Oct 22 2008 vuntz@suse.de - Only install GnomeOnlineHelp.desktop and SuSE.desktop in /usr/share/dist/desktop-files for openSUSE. ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.WV9885/_old 2008-10-30 18:01:23.000000000 +0100 +++ /var/tmp/diff_new_pack.WV9885/_new 2008-10-30 18:01:23.000000000 +0100 @@ -187,9 +187,9 @@ %gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}111-1600x1200.png" %endif %if %build_SLED || %build_SLES -test -f %{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg +test -f %{_datadir}/wallpapers/%{desktop_data}110-1600x1200.png # WARNING: Don't forget to change value in scriptlets below: -%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg" +%gconf_set /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.png" %endif %gconf_set /desktop/gnome/background/picture_options --type=string "stretched" %gconf_set /desktop/gnome/background/primary_color --type=string "#258c06" @@ -256,7 +256,7 @@ %endif %if %build_SLED || %build_SLES gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ - /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.jpg" + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{desktop_data}110-1600x1200.png" %endif fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de