Hello community, here is the log from the commit of package gconf2-branding-openSUSE for openSUSE:Factory checked in at Thu Aug 13 18:37:27 CEST 2009. -------- --- gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2009-07-31 19:16:51.000000000 +0200 +++ gconf2-branding-openSUSE/gconf2-branding-SLED.changes 2009-08-13 18:35:32.685134000 +0200 @@ -1,0 +2,11 @@ +Wed Aug 5 11:20:49 CEST 2009 - vuntz@novell.com + +- Requires tomboy on openSUSE and SLED since it's in the default + panel layout. Fix bnc#518226. + +------------------------------------------------------------------- +Mon Aug 3 23:40:51 CEST 2009 - vuntz@novell.com + +- Set /apps/epiphany/web/user_agent_vendor to SUSE/version-release. + +------------------------------------------------------------------- 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.oAuZ1S/_old 2009-08-13 18:37:03.000000000 +0200 +++ /var/tmp/diff_new_pack.oAuZ1S/_new 2009-08-13 18:37:03.000000000 +0200 @@ -45,7 +45,7 @@ Group: System/GUI/GNOME Summary: SLED defaults for the GNOME configuration system Version: 2.26 -Release: 5 +Release: 6 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: gconf2 @@ -69,6 +69,9 @@ Conflicts: otherproviders(gconf2-branding) Supplements: packageand(gconf2:branding-SLED) BuildRequires: desktop-data-%{desktop_data} gconf2 +# needed for epiphany version +BuildRequires: epiphany +%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) # For directory ownership of %{_datadir}/backgrounds: # BuildRequires: gnome-themes #BRAND: gconf2-branding-openSUSE provides branding Look and Feel using @@ -85,6 +88,10 @@ # the sound theme inherits from the freedesktop one Requires: sound-theme-freedesktop %endif +%if ! %build_SLES +# tomboy is in the default panel configuration +Requires: tomboy +%endif Suggests: desktop-data-SLED-extra-gnome %description @@ -100,7 +107,7 @@ Summary: Dynamic Wallpaper with SLED Look Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 1 +Release: 2 %description -n desktop-data-SLED-extra-gnome This optional package contains nice dynamic wallpaper with SLED @@ -159,6 +166,7 @@ %if %build_SLED || %build_SLES %gconf_set /apps/epiphany/general/homepage --type=string "http://www.novell.com/linux/11/" %endif +%gconf_set /apps/epiphany/web/user_agent_vendor --type=string "SUSE/%{epiphany_version}" # Display all workspaces in the gnome-panel window list applet: # 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" ++++++ gconf2-branding-SLES.spec ++++++ --- /var/tmp/diff_new_pack.oAuZ1S/_old 2009-08-13 18:37:03.000000000 +0200 +++ /var/tmp/diff_new_pack.oAuZ1S/_new 2009-08-13 18:37:03.000000000 +0200 @@ -45,7 +45,7 @@ Group: System/GUI/GNOME Summary: SLES defaults for the GNOME configuration system Version: 2.26 -Release: 5 +Release: 6 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: gconf2 @@ -69,6 +69,9 @@ Conflicts: otherproviders(gconf2-branding) Supplements: packageand(gconf2:branding-SLES) BuildRequires: desktop-data-%{desktop_data} gconf2 +# needed for epiphany version +BuildRequires: epiphany +%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) # For directory ownership of %{_datadir}/backgrounds: # BuildRequires: gnome-themes #BRAND: gconf2-branding-openSUSE provides branding Look and Feel using @@ -85,6 +88,10 @@ # the sound theme inherits from the freedesktop one Requires: sound-theme-freedesktop %endif +%if ! %build_SLES +# tomboy is in the default panel configuration +Requires: tomboy +%endif Suggests: desktop-data-SLES-extra-gnome %description @@ -100,7 +107,7 @@ Summary: Dynamic Wallpaper with SLES Look Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 1 +Release: 2 %description -n desktop-data-SLES-extra-gnome This optional package contains nice dynamic wallpaper with SLES @@ -159,6 +166,7 @@ %if %build_SLED || %build_SLES %gconf_set /apps/epiphany/general/homepage --type=string "http://www.novell.com/linux/11/" %endif +%gconf_set /apps/epiphany/web/user_agent_vendor --type=string "SUSE/%{epiphany_version}" # Display all workspaces in the gnome-panel window list applet: # 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" ++++++ gconf2-branding-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.oAuZ1S/_old 2009-08-13 18:37:03.000000000 +0200 +++ /var/tmp/diff_new_pack.oAuZ1S/_new 2009-08-13 18:37:03.000000000 +0200 @@ -45,7 +45,7 @@ Group: System/GUI/GNOME Summary: openSUSE defaults for the GNOME configuration system Version: 2.26 -Release: 5 +Release: 6 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: gconf2 @@ -69,6 +69,9 @@ Conflicts: otherproviders(gconf2-branding) Supplements: packageand(gconf2:branding-openSUSE) BuildRequires: desktop-data-%{desktop_data} gconf2 +# needed for epiphany version +BuildRequires: epiphany +%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) # For directory ownership of %{_datadir}/backgrounds: # BuildRequires: gnome-themes #BRAND: gconf2-branding-openSUSE provides branding Look and Feel using @@ -85,6 +88,10 @@ # the sound theme inherits from the freedesktop one Requires: sound-theme-freedesktop %endif +%if ! %build_SLES +# tomboy is in the default panel configuration +Requires: tomboy +%endif Suggests: desktop-data-openSUSE-extra-gnome %description @@ -100,7 +107,7 @@ Summary: Dynamic Wallpaper with openSUSE Look Group: System/GUI/GNOME Version: %{desktop_data_ver} -Release: 1 +Release: 2 %description -n desktop-data-openSUSE-extra-gnome This optional package contains nice dynamic wallpaper with openSUSE @@ -159,6 +166,7 @@ %if %build_SLED || %build_SLES %gconf_set /apps/epiphany/general/homepage --type=string "http://www.novell.com/linux/11/" %endif +%gconf_set /apps/epiphany/web/user_agent_vendor --type=string "SUSE/%{epiphany_version}" # Display all workspaces in the gnome-panel window list applet: # 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" ++++++ gconf2-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.oAuZ1S/_old 2009-08-13 18:37:03.000000000 +0200 +++ /var/tmp/diff_new_pack.oAuZ1S/_new 2009-08-13 18:37:03.000000000 +0200 @@ -69,6 +69,9 @@ Conflicts: otherproviders(gconf2-branding) Supplements: packageand(gconf2:branding-%{branding_name}) BuildRequires: desktop-data-%{desktop_data} gconf2 +# needed for epiphany version +BuildRequires: epiphany +%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) # For directory ownership of %{_datadir}/backgrounds: # BuildRequires: gnome-themes #BRAND: gconf2-branding-openSUSE provides branding Look and Feel using @@ -85,6 +88,10 @@ # the sound theme inherits from the freedesktop one Requires: sound-theme-freedesktop %endif +%if ! %build_SLES +# tomboy is in the default panel configuration +Requires: tomboy +%endif Suggests: desktop-data-%{branding_name}-extra-gnome %description @@ -159,6 +166,7 @@ %if %build_SLED || %build_SLES %gconf_set /apps/epiphany/general/homepage --type=string "http://www.novell.com/linux/11/" %endif +%gconf_set /apps/epiphany/web/user_agent_vendor --type=string "SUSE/%{epiphany_version}" # Display all workspaces in the gnome-panel window list applet: # 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" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org