Hello community, here is the log from the commit of package gnome-session checked in at Tue May 13 12:41:22 CEST 2008. -------- --- GNOME/gnome-session/gnome-session.changes 2008-05-06 14:16:43.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-session/gnome-session.changes 2008-05-13 09:17:20.584642000 +0200 @@ -1,0 +2,7 @@ +Tue May 13 09:22:13 CEST 2008 - vuntz@suse.de + +- Update gnome-session-gnome-wm-compiz-manager.patch to look for + the right file for compiz activation. Fix bnc#389648, thanks to + Jigish Gohil. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.En9487/_old 2008-05-13 12:40:31.000000000 +0200 +++ /var/tmp/diff_new_pack.En9487/_new 2008-05-13 12:40:31.000000000 +0200 @@ -16,7 +16,7 @@ License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.22.1.1 -Release: 23 +Release: 27 Summary: Session Tools for the GNOME 2.x Desktop Source: %{name}-%{version}.tar.bz2 Source1: gnome @@ -179,6 +179,10 @@ %files lang -f %{name}-2.0.lang %changelog +* Tue May 13 2008 vuntz@suse.de +- Update gnome-session-gnome-wm-compiz-manager.patch to look for + the right file for compiz activation. Fix bnc#389648, thanks to + Jigish Gohil. * Tue May 06 2008 rodrigo@suse.de - Updated gnome-session-parse-autostart-command-line.patch to deal also with %%U arguments in .desktop files (bnc#242907) ++++++ gnome-session-gnome-wm-compiz-manager.patch ++++++ --- /var/tmp/diff_new_pack.En9487/_old 2008-05-13 12:40:32.000000000 +0200 +++ /var/tmp/diff_new_pack.En9487/_new 2008-05-13 12:40:32.000000000 +0200 @@ -1,7 +1,7 @@ diff -aurp gnome-session-2.22.1.1/gnome-session/gnome-wm gnome-session-2.22.1.1-patched/gnome-session/gnome-wm --- gnome-session-2.22.1.1/gnome-session/gnome-wm 2008-04-10 16:32:20.000000000 +0200 -+++ gnome-session-2.22.1.1-patched/gnome-session/gnome-wm 2008-05-05 11:22:33.628080000 +0200 -@@ -39,6 +39,14 @@ done ++++ gnome-session-2.22.1.1-patched/gnome-session/gnome-wm 2008-05-13 09:15:37.539788000 +0200 +@@ -39,22 +39,33 @@ done # WINDOW_MANAGER overrides all @@ -16,22 +16,21 @@ if [ -z "$WINDOW_MANAGER" ] ; then # Create a list of window manager we can handle, trying to only use the # compositing ones when it makes sense -@@ -46,15 +54,21 @@ if [ -z "$WINDOW_MANAGER" ] ; then - xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null - IS_X_COMPOSITED=$? -- KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm" -- if [ $IS_X_COMPOSITED -eq 0 ] ; then -- KNOWN_WM="compiz beryl $KNOWN_WM" +- xdpyinfo 2> /dev/null | grep -q "^ *Composite$" 2> /dev/null +- IS_X_COMPOSITED=$? + if [ "x$XDG_CONFIG_HOME" = "x" ]; then -+ COMPIZ_ENABLED_FILE="$HOME/.config/compiz/enable/enable-compiz" ++ COMPIZ_ENABLED_FILE="$HOME/.config/compiz/enable-compiz" + else -+ COMPIZ_ENABLED_FILE="$XDG_CONFIG_HOME/compiz/enable/enable-compiz" ++ COMPIZ_ENABLED_FILE="$XDG_CONFIG_HOME/compiz/enable-compiz" + fi + + KNOWN_WM="metacity sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm" -+ -+ if [ -f "$COMPIZ_ENABLED_FILE" -a $IS_X_COMPOSITED -eq 0 ] ; then + +- KNOWN_WM="sawfish sawmill enlightenment icewm wmaker fvwm2 qvwm fvwm twm kwm" +- if [ $IS_X_COMPOSITED -eq 0 ] ; then +- KNOWN_WM="compiz beryl $KNOWN_WM" ++ if [ -f "$COMPIZ_ENABLED_FILE" ] ; then + KNOWN_WM="compiz-manager $KNOWN_WM" fi - # metacity is still the default wm in GNOME @@ -43,7 +42,7 @@ for wm in $KNOWN_WM ; do IFS=":" for dir in $PATH ; do -@@ -65,6 +79,7 @@ if [ -z "$WINDOW_MANAGER" ] ; then +@@ -65,6 +76,7 @@ if [ -z "$WINDOW_MANAGER" ] ; then done IFS=$OLDIFS done @@ -51,7 +50,7 @@ else WINDOW_MANAGER=$DEFWM fi -@@ -104,11 +119,7 @@ if [ ! -z "$SMID" ] ; then +@@ -104,11 +116,7 @@ if [ ! -z "$SMID" ] ; then OPT1=-i OPT2=$SMID ;; @@ -64,7 +63,7 @@ OPT1=--sm-client-id OPT2=$SMID ;; -@@ -116,18 +127,6 @@ if [ ! -z "$SMID" ] ; then +@@ -116,18 +124,6 @@ if [ ! -z "$SMID" ] ; then esac 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