Hello community, here is the log from the commit of package gconf2-branding-openSUSE for openSUSE:Factory checked in at Mon Jan 10 16:12:07 CET 2011. -------- --- gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2010-09-24 01:01:35.000000000 +0200 +++ gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2011-01-10 15:59:01.908188000 +0100 @@ -1,0 +2,15 @@ +Sat Jan 8 10:50:09 CET 2011 - vuntz@opensuse.org + +- Update version to 11.4, to have the same version as + desktop-data-openSUSE, so it's installable. +- Remove support for openSUSE 11.1, which is not maintained + anymore. +- Use the appropriate dynamic background as default: we want the + same dynamic background as the default background for the version + of openSUSE we're built against. This implies: + + we define what is the dynamic background for each version + + we use %triggerin/%triggerpostun on openSUSE-dynamic-wallpaper + or openSUSE-dynamic-wallpapers-old, depending on where the + appropriate dynamic bckground lives. + +------------------------------------------------------------------- gconf2-branding-SLES.changes: same change gconf2-branding-openSUSE.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gconf2-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.tV8Zra/_old 2011-01-10 15:59:16.000000000 +0100 +++ /var/tmp/diff_new_pack.tV8Zra/_new 2011-01-10 15:59:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gconf2-branding-SLED (Version 11) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -25,23 +25,32 @@ %define branding_name openSUSE %define desktop_data openSUSE %define dynamic_file IK/IK.xml +%define dynamic_is_latest 1 +%define desktop_data_ver 11.4 +# Note: when updating this, don't forget to also change everything that is +# related to the current dynamic background (dynamic_file, dynamic_is_latest, +# and where the previous dynamic background is installed) +%define wallpaper_file openSUSE113-1600x1200.jpg +%if %suse_version == 1130 +%define dynamic_file IK/IK.xml +%define dynamic_is_latest 1 %define desktop_data_ver 11.3 %define wallpaper_file openSUSE113-1600x1200.jpg +%else # %%suse_version == 1130 %if %suse_version == 1120 +%define dynamic_file daft/daft.xml +%define dynamic_is_latest 0 %define desktop_data_ver 11.2 %define wallpaper_file openSUSE112-1600x1200.png -%else -%if %suse_version == 1110 -%define desktop_data_ver 11.1 -%define wallpaper_file openSUSE111-1600x1200.png -%endif -%endif -%endif +%endif # %%suse_version == 1120 +%endif # %%suse_version == 1130 +%endif # %%build_openSUSE %if %build_SLED %define branding_name SLED %define desktop_data SLED %define desktop_data_ver 11 %define dynamic_file nonexisting +%define dynamic_is_latest 0 %define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES @@ -49,6 +58,7 @@ %define desktop_data SLED %define desktop_data_ver 11 %define dynamic_file nonexisting +%define dynamic_is_latest 0 %define wallpaper_file SLED110-1600x1200.png %endif @@ -59,7 +69,7 @@ Group: System/GUI/GNOME Summary: SLED defaults for the GNOME configuration system Version: %{desktop_data_ver} -Release: 1 +Release: 2 Source: gconf2-branding_spec-prepare.sh # panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries @@ -337,6 +347,7 @@ rm -rf $RPM_BUILD_ROOT %if %build_openSUSE +%if %dynamic_is_latest %triggerin -- SLED-dynamic-wallpaper # If SLED-dynamic-wallpaper exists, we want nice dynamic background. @@ -350,6 +361,22 @@ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true fi +%else # %%dynamic_is_latest + +%triggerin -- SLED-dynamic-wallpapers-old +# If SLED-dynamic-wallpaper exists, we want nice dynamic background. +gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" || true + +%triggerpostun -- SLED-dynamic-wallpapers-old +# If SLED-dynamic-wallpaper exists, we want nice dynamic background. +if ! test -f %{_datadir}/backgrounds/%{dynamic_file} ; then + gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true +fi + +%endif # %%dynamic_is_latest + %post if [ $1 == 1 ]; then # If SLED-dynamic-wallpaper exists on install (not upgrade), we want nice dynamic background. @@ -358,7 +385,7 @@ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" fi fi -%endif +%endif # %%build_openSUSE %files %defattr(-,root,root) ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.tV8Zra/_old 2011-01-10 15:59:16.000000000 +0100 +++ /var/tmp/diff_new_pack.tV8Zra/_new 2011-01-10 15:59:16.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gconf2-branding-SLES (Version 11) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -25,23 +25,32 @@ %define branding_name openSUSE %define desktop_data openSUSE %define dynamic_file IK/IK.xml +%define dynamic_is_latest 1 +%define desktop_data_ver 11.4 +# Note: when updating this, don't forget to also change everything that is +# related to the current dynamic background (dynamic_file, dynamic_is_latest, +# and where the previous dynamic background is installed) +%define wallpaper_file openSUSE113-1600x1200.jpg +%if %suse_version == 1130 +%define dynamic_file IK/IK.xml +%define dynamic_is_latest 1 %define desktop_data_ver 11.3 %define wallpaper_file openSUSE113-1600x1200.jpg +%else # %%suse_version == 1130 %if %suse_version == 1120 +%define dynamic_file daft/daft.xml +%define dynamic_is_latest 0 %define desktop_data_ver 11.2 %define wallpaper_file openSUSE112-1600x1200.png -%else -%if %suse_version == 1110 -%define desktop_data_ver 11.1 -%define wallpaper_file openSUSE111-1600x1200.png -%endif -%endif -%endif +%endif # %%suse_version == 1120 +%endif # %%suse_version == 1130 +%endif # %%build_openSUSE %if %build_SLED %define branding_name SLED %define desktop_data SLED %define desktop_data_ver 11 %define dynamic_file nonexisting +%define dynamic_is_latest 0 %define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES @@ -49,6 +58,7 @@ %define desktop_data SLED %define desktop_data_ver 11 %define dynamic_file nonexisting +%define dynamic_is_latest 0 %define wallpaper_file SLED110-1600x1200.png %endif @@ -59,7 +69,7 @@ Group: System/GUI/GNOME Summary: SLES defaults for the GNOME configuration system Version: %{desktop_data_ver} -Release: 1 +Release: 2 Source: gconf2-branding_spec-prepare.sh # panel-default-setup.entries from gnome-panel (patched version): Source2: panel-default-setup.entries @@ -337,6 +347,7 @@ rm -rf $RPM_BUILD_ROOT %if %build_openSUSE +%if %dynamic_is_latest %triggerin -- SLES-dynamic-wallpaper # If SLES-dynamic-wallpaper exists, we want nice dynamic background. @@ -350,6 +361,22 @@ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true fi +%else # %%dynamic_is_latest + +%triggerin -- SLES-dynamic-wallpapers-old +# If SLES-dynamic-wallpaper exists, we want nice dynamic background. +gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" || true + +%triggerpostun -- SLES-dynamic-wallpapers-old +# If SLES-dynamic-wallpaper exists, we want nice dynamic background. +if ! test -f %{_datadir}/backgrounds/%{dynamic_file} ; then + gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true +fi + +%endif # %%dynamic_is_latest + %post if [ $1 == 1 ]; then # If SLES-dynamic-wallpaper exists on install (not upgrade), we want nice dynamic background. @@ -358,7 +385,7 @@ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" fi fi -%endif +%endif # %%build_openSUSE %files %defattr(-,root,root) ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.tV8Zra/_old 2011-01-10 15:59:16.000000000 +0100 +++ /var/tmp/diff_new_pack.tV8Zra/_new 2011-01-10 15:59:16.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package gconf2-branding-openSUSE (Version 11.1) +# spec file for package gconf2-branding-openSUSE (Version 11.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -25,23 +25,32 @@ %define branding_name openSUSE %define desktop_data openSUSE %define dynamic_file IK/IK.xml +%define dynamic_is_latest 1 +%define desktop_data_ver 11.4 +# Note: when updating this, don't forget to also change everything that is +# related to the current dynamic background (dynamic_file, dynamic_is_latest, +# and where the previous dynamic background is installed) +%define wallpaper_file openSUSE113-1600x1200.jpg +%if %suse_version == 1130 +%define dynamic_file IK/IK.xml +%define dynamic_is_latest 1 %define desktop_data_ver 11.3 %define wallpaper_file openSUSE113-1600x1200.jpg +%else # %%suse_version == 1130 %if %suse_version == 1120 +%define dynamic_file daft/daft.xml +%define dynamic_is_latest 0 %define desktop_data_ver 11.2 %define wallpaper_file openSUSE112-1600x1200.png -%else -%if %suse_version == 1110 -%define desktop_data_ver 11.1 -%define wallpaper_file openSUSE111-1600x1200.png -%endif -%endif -%endif +%endif # %%suse_version == 1120 +%endif # %%suse_version == 1130 +%endif # %%build_openSUSE %if %build_SLED %define branding_name SLED %define desktop_data SLED %define desktop_data_ver 11 %define dynamic_file nonexisting +%define dynamic_is_latest 0 %define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES @@ -49,6 +58,7 @@ %define desktop_data SLED %define desktop_data_ver 11 %define dynamic_file nonexisting +%define dynamic_is_latest 0 %define wallpaper_file SLED110-1600x1200.png %endif @@ -337,6 +347,7 @@ rm -rf $RPM_BUILD_ROOT %if %build_openSUSE +%if %dynamic_is_latest %triggerin -- openSUSE-dynamic-wallpaper # If openSUSE-dynamic-wallpaper exists, we want nice dynamic background. @@ -350,6 +361,22 @@ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true fi +%else # %%dynamic_is_latest + +%triggerin -- openSUSE-dynamic-wallpapers-old +# If openSUSE-dynamic-wallpaper exists, we want nice dynamic background. +gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" || true + +%triggerpostun -- openSUSE-dynamic-wallpapers-old +# If openSUSE-dynamic-wallpaper exists, we want nice dynamic background. +if ! test -f %{_datadir}/backgrounds/%{dynamic_file} ; then + gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true +fi + +%endif # %%dynamic_is_latest + %post if [ $1 == 1 ]; then # If openSUSE-dynamic-wallpaper exists on install (not upgrade), we want nice dynamic background. @@ -358,7 +385,7 @@ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" fi fi -%endif +%endif # %%build_openSUSE %files %defattr(-,root,root) ++++++ gconf2-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.tV8Zra/_old 2011-01-10 15:59:16.000000000 +0100 +++ /var/tmp/diff_new_pack.tV8Zra/_new 2011-01-10 15:59:16.000000000 +0100 @@ -1,4 +1,19 @@ ------------------------------------------------------------------- +Sat Jan 8 10:50:09 CET 2011 - vuntz@opensuse.org + +- Update version to 11.4, to have the same version as + desktop-data-openSUSE, so it's installable. +- Remove support for openSUSE 11.1, which is not maintained + anymore. +- Use the appropriate dynamic background as default: we want the + same dynamic background as the default background for the version + of openSUSE we're built against. This implies: + + we define what is the dynamic background for each version + + we use %triggerin/%triggerpostun on openSUSE-dynamic-wallpaper + or openSUSE-dynamic-wallpapers-old, depending on where the + appropriate dynamic bckground lives. + +------------------------------------------------------------------- Tue Sep 21 19:35:59 CEST 2010 - vuntz@opensuse.org - Move the novell sound theme to a novell-sound-theme subpackage, ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.tV8Zra/_old 2011-01-10 15:59:16.000000000 +0100 +++ /var/tmp/diff_new_pack.tV8Zra/_new 2011-01-10 15:59:16.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package gconf2-branding-%{branding_name} (Version 11.3) +# spec file for package gconf2-branding-%{branding_name} (Version 11.4) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,23 +25,32 @@ %define branding_name openSUSE %define desktop_data openSUSE %define dynamic_file IK/IK.xml +%define dynamic_is_latest 1 +%define desktop_data_ver 11.4 +# Note: when updating this, don't forget to also change everything that is +# related to the current dynamic background (dynamic_file, dynamic_is_latest, +# and where the previous dynamic background is installed) +%define wallpaper_file openSUSE113-1600x1200.jpg +%if %suse_version == 1130 +%define dynamic_file IK/IK.xml +%define dynamic_is_latest 1 %define desktop_data_ver 11.3 %define wallpaper_file openSUSE113-1600x1200.jpg +%else # %%suse_version == 1130 %if %suse_version == 1120 +%define dynamic_file daft/daft.xml +%define dynamic_is_latest 0 %define desktop_data_ver 11.2 %define wallpaper_file openSUSE112-1600x1200.png -%else -%if %suse_version == 1110 -%define desktop_data_ver 11.1 -%define wallpaper_file openSUSE111-1600x1200.png -%endif -%endif -%endif +%endif # %%suse_version == 1120 +%endif # %%suse_version == 1130 +%endif # %%build_openSUSE %if %build_SLED %define branding_name SLED %define desktop_data SLED %define desktop_data_ver 11 %define dynamic_file nonexisting +%define dynamic_is_latest 0 %define wallpaper_file SLED110-1600x1200.png %endif %if %build_SLES @@ -49,6 +58,7 @@ %define desktop_data SLED %define desktop_data_ver 11 %define dynamic_file nonexisting +%define dynamic_is_latest 0 %define wallpaper_file SLED110-1600x1200.png %endif @@ -333,6 +343,8 @@ rm -rf $RPM_BUILD_ROOT %if %build_openSUSE +%if %dynamic_is_latest + %triggerin -- %{branding_name}-dynamic-wallpaper # If %{branding_name}-dynamic-wallpaper exists, we want nice dynamic background. gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ @@ -345,6 +357,22 @@ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true fi +%else # %%dynamic_is_latest + +%triggerin -- %{branding_name}-dynamic-wallpapers-old +# If %{branding_name}-dynamic-wallpaper exists, we want nice dynamic background. +gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" || true + +%triggerpostun -- %{branding_name}-dynamic-wallpapers-old +# If %{branding_name}-dynamic-wallpaper exists, we want nice dynamic background. +if ! test -f %{_datadir}/backgrounds/%{dynamic_file} ; then + gconftool-2 >/dev/null --direct --config-source=xml::%{_sysconfdir}/gconf/gconf.xml.vendor --set\ + /desktop/gnome/background/picture_filename --type=string "%{_datadir}/wallpapers/%{wallpaper_file}" || true +fi + +%endif # %%dynamic_is_latest + %post if [ $1 == 1 ]; then # If %{branding_name}-dynamic-wallpaper exists on install (not upgrade), we want nice dynamic background. @@ -353,7 +381,7 @@ /desktop/gnome/background/picture_filename --type=string "%{_datadir}/backgrounds/%{dynamic_file}" fi fi -%endif +%endif # %%build_openSUSE %files %defattr(-,root,root) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org