Hello community, here is the log from the commit of package gnome-session for openSUSE:Factory checked in at Thu May 28 03:52:58 CEST 2009. -------- --- GNOME/gnome-session/gnome-session.changes 2009-04-14 21:17:03.000000000 +0200 +++ gnome-session/gnome-session.changes 2009-05-25 16:24:53.000000000 +0200 @@ -1,0 +2,7 @@ +Mon May 25 16:23:54 CEST 2009 - vuntz@novell.com + +- Update gnome-session-gnome-wm-compiz-manager.patch to enable + compiz only if the compiz-enabled file is newer than + /etc/X11/xorg.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-session.spec ++++++ --- /var/tmp/diff_new_pack.P21227/_old 2009-05-28 03:51:52.000000000 +0200 +++ /var/tmp/diff_new_pack.P21227/_new 2009-05-28 03:51:52.000000000 +0200 @@ -33,7 +33,7 @@ License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.26.1 -Release: 1 +Release: 2 Summary: Session Tools for the GNOME 2.x Desktop Url: http://www.gnome.org Source: %{name}-%{version}.tar.bz2 @@ -183,6 +183,10 @@ ##%endif %changelog +* Mon May 25 2009 vuntz@novell.com +- Update gnome-session-gnome-wm-compiz-manager.patch to enable + compiz only if the compiz-enabled file is newer than + /etc/X11/xorg.conf * Tue Apr 14 2009 vuntz@novell.com - Update to version 2.26.1: + Fix inhibitor dialog not showing the right action button when ++++++ gnome-session-gnome-wm-compiz-manager.patch ++++++ --- /var/tmp/diff_new_pack.P21227/_old 2009-05-28 03:51:53.000000000 +0200 +++ /var/tmp/diff_new_pack.P21227/_new 2009-05-28 03:51:53.000000000 +0200 @@ -1,9 +1,10 @@ -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/data/gnome-wm 2008-04-10 16:32:20.000000000 +0200 -+++ gnome-session-2.22.1.1-patched/data/gnome-wm 2008-05-13 09:15:37.539788000 +0200 -@@ -39,22 +39,33 @@ done - - # WINDOW_MANAGER overrides all +Index: gnome-session-2.26.1/data/gnome-wm +=================================================================== +--- gnome-session-2.26.1.orig/data/gnome-wm ++++ gnome-session-2.26.1/data/gnome-wm +@@ -51,22 +51,33 @@ if [ "x$WINDOW_MANAGER" = "xgnome-wm" ]; + WINDOW_MANAGER="" + fi +# Migrate compiz to compiz-manager +if [ "x$WINDOW_MANAGER" = "xcompiz" ]; then @@ -30,7 +31,7 @@ - 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 ++ if test -f "$COMPIZ_ENABLED_FILE" -a "$COMPIZ_ENABLED_FILE" -nt /etc/X11/xorg.conf; then + KNOWN_WM="compiz-manager $KNOWN_WM" fi - # metacity is still the default wm in GNOME @@ -42,7 +43,7 @@ for wm in $KNOWN_WM ; do IFS=":" for dir in $PATH ; do -@@ -65,6 +76,7 @@ if [ -z "$WINDOW_MANAGER" ] ; then +@@ -77,6 +88,7 @@ if [ -z "$WINDOW_MANAGER" ] ; then done IFS=$OLDIFS done @@ -50,7 +51,7 @@ else WINDOW_MANAGER=$DEFWM fi -@@ -104,11 +116,7 @@ if [ ! -z "$SMID" ] ; then +@@ -116,11 +128,7 @@ if [ ! -z "$SMID" ] ; then OPT1=-i OPT2=$SMID ;; @@ -63,7 +64,7 @@ OPT1=--sm-client-id OPT2=$SMID ;; -@@ -116,18 +124,6 @@ if [ ! -z "$SMID" ] ; then +@@ -128,18 +136,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