From 02d664844803fa828b38ed927dad540d5b4f5c436078835ca57b56c6765e604e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 14 Apr 2008 17:49:17 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=38 --- gnome | 30 ++++++++++++------------------ gnome-session.changes | 7 +++++++ gnome-session.spec | 8 ++++++-- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/gnome b/gnome index 96a4a6d..1de4f94 100644 --- a/gnome +++ b/gnome @@ -1,35 +1,29 @@ #!/bin/bash # # This is not the original gnome-session but a start script -# to install some preconfiguration for GNOME2 +# to install some preconfiguration for GNOME2 # and some variables to check. # # For feedback on this script please use # https://bugzilla.novell.com/ # -# If user still uses default wallpaper or old wallpaper image does not exist any more, update to default: +# openSUSE <= 10.3 and SLED <= 10 modified the user GConf database to change background. +# New openSUSE obsoletes this mechanism by branding and gnome-wp-list. +# We still have to detect old modifications in the user database and remove them. +# +# This code may disappear after SLED 12: OLD_WALLPAPER=$(gconftool-2 --get /desktop/gnome/background/picture_filename 2>/dev/null) PICTURE_OPTIONS=$(gconftool-2 --get /desktop/gnome/background/picture_options 2>/dev/null) if [ "$PICTURE_OPTIONS" != "none" -a \(\ "$OLD_WALLPAPER" != "${OLD_WALLPAPER#/usr/share/wallpapers/default}" -o ! -e "$OLD_WALLPAPER" \) ] ; then - - DIMENSIONS=$(xdpyinfo | sed -n 's/^ *dimensions: *\([^ ]*\) .*$/\1/p') - X=${DIMENSIONS%x*} - Y=${DIMENSIONS#*x} - # Select normal or wide angle wallpaper: - GNOME_WALLPAPER="default-1600x1200.jpg" - [ $((($X * 10) / $Y)) -ge 15 ] && GNOME_WALLPAPER="default-1920x1200.jpg" - GNOME_WALLPAPER="/usr/share/wallpapers/"$GNOME_WALLPAPER - if [ -e "$GNOME_WALLPAPER" -a "$GNOME_WALLPAPER" != "$OLD_WALLPAPER" ] ; then - gconftool-2 -s /desktop/gnome/background/picture_filename --type string $GNOME_WALLPAPER - gconftool-2 -s /desktop/gnome/background/picture_options --type string stretched - fi + gconftool-2 -u /desktop/gnome/background/picture_filename + gconftool-2 -u /desktop/gnome/background/picture_options fi function use_sled10_default { - # do this only for SLED 10 - ([ -e /etc/SuSE-release ] && grep "SUSE Linux Enterprise Desktop 11" /etc/SuSE-release) || return + # do this only for SLED * + ([ -e /etc/SuSE-release ] && grep "SUSE Linux Enterprise Desktop" /etc/SuSE-release) || return # do this only one time [ -e $HOME/.skel/sled10-run ] && return @@ -53,7 +47,7 @@ function use_sled10_default { # start up the gnome2 session -# reset the SLED 10 UI only if upgrading from NLD9/SLES9, anything newer we +# reset the SLED 10 UI only if upgrading from NLD9/SLES9, anything newer we # ignore (like SL 9.3), the logic here is redundant but its low risk # Remove this code after SLED11: mkdir -p $HOME/.skel @@ -63,7 +57,7 @@ if [ ! -e $HOME/.skel/gnome2-run ] || [ -e $HOME/.skel/gnome2-run-9.2 ] ; then fi if [ $TRY_SLED10 -gt 0 ] ; then - use_sled11_default + use_sled10_default else touch ~/.skel/sled10-run fi diff --git a/gnome-session.changes b/gnome-session.changes index 7437b49..58d4e33 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Apr 14 18:55:56 CEST 2008 - sbrabec@suse.cz + +- Removed /usr/bin/gnome code modifying default background in user + gconf database (bnc#369924). +- Use packageand form of branding supplement. + ------------------------------------------------------------------- Fri Apr 11 16:03:52 CEST 2008 - maw@suse.de diff --git a/gnome-session.spec b/gnome-session.spec index 51f2d4b..09bc88a 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -16,7 +16,7 @@ BuildRequires: control-center2-devel fdupes gnome-common gnome-desktop-devel gn License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.22.1.1 -Release: 1 +Release: 4 Summary: Session Tools for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Source1: gnome @@ -88,7 +88,7 @@ License: GPL v2 or later; LGPL v2.1 or later Summary: Session Tools for the GNOME 2.x Desktop Group: System/GUI/GNOME Provides: %{name}-branding = %{version} -Supplements: branding-upstream +Supplements: packageand(branding-upstream:%{name}) #BRAND: gnome-splash.png: Splash screen. Bottom 70 pixels are used for #BRAND: "just starting" icons. This area is bright in the original #BRAND: branding. Must be png or change system gconf key @@ -181,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT %files lang -f %{name}-2.0.lang %changelog +* Mon Apr 14 2008 sbrabec@suse.cz +- Removed /usr/bin/gnome code modifying default background in user + gconf database (bnc#369924). +- Use packageand form of branding supplement. * Fri Apr 11 2008 maw@suse.de - Update to version 2.22.1.1: + Migrate Trash files to the new trash location (and fix a bug