From 0b8f849e1ad6fbf80679ea6053152fe51222cfe2 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@fedoraproject.org>
Date: Aug 10 2007 19:09:52 +0000
Subject: - Edit window manager patch again to add 'glib' to compiz launch.


---

diff --git a/gnome-session-2.17.5-window-manager.patch b/gnome-session-2.17.5-window-manager.patch
index b4a631e..3173f8b 100644
--- a/gnome-session-2.17.5-window-manager.patch
+++ b/gnome-session-2.17.5-window-manager.patch
@@ -1,6 +1,6 @@
 diff -up gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager gnome-session-2.19.6/data/gnome-session.schemas.in
 --- gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager	2007-07-30 16:07:16.000000000 -0400
-+++ gnome-session-2.19.6/data/gnome-session.schemas.in	2007-08-09 17:40:50.000000000 -0400
++++ gnome-session-2.19.6/data/gnome-session.schemas.in	2007-08-09 17:47:42.000000000 -0400
 @@ -2,11 +2,22 @@
  <gconfschemafile>
     <schemalist>
@@ -27,7 +27,7 @@ diff -up gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager gnome
              <long>Show the splash screen when the session starts up</long>
 diff -up gnome-session-2.19.6/gnome-session/gnome-wm.window-manager gnome-session-2.19.6/gnome-session/gnome-wm
 --- gnome-session-2.19.6/gnome-session/gnome-wm.window-manager	2007-07-30 16:07:15.000000000 -0400
-+++ gnome-session-2.19.6/gnome-session/gnome-wm	2007-08-09 17:44:21.000000000 -0400
++++ gnome-session-2.19.6/gnome-session/gnome-wm	2007-08-10 15:01:04.000000000 -0400
 @@ -3,7 +3,9 @@
  # The user can specify his prefered WM by setting the WINDOW_MANAGER
  # environment variable.
@@ -49,11 +49,30 @@ diff -up gnome-session-2.19.6/gnome-session/gnome-wm.window-manager gnome-sessio
  
  if [ -z "$WINDOW_MANAGER" ] ; then
    # Create a list of window manager we can handle, trying to only use the
-@@ -117,6 +122,7 @@ fi
+@@ -82,6 +87,7 @@ fi
+ OPT1=
+ OPT2=
+ OPT3=
++OPT4=
+ if [ ! -z "$SMID" ] ; then
+   case `basename $WINDOW_MANAGER` in
+     sawfish|sawmill|metacity)
+@@ -117,14 +123,16 @@ fi
  
  case `basename $WINDOW_MANAGER` in
    compiz)
 +    export LIBGL_ALWAYS_INDIRECT=1
      gtk-window-decorator &
-     OPT3=gconf
+-    OPT3=gconf
++    OPT3=glib
++    OPT4=gconf
      ;;
+   beryl)
+     emerald &
+     ;;
+ esac
+ 
+-exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3
++exec $WINDOW_MANAGER $OPT1 $OPT2 $OPT3 $OPT4
+ 
+ echo "ERROR: No window manager could run!"
diff --git a/gnome-session.spec b/gnome-session.spec
index cdfc043..b8a5f2b 100644
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.19.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.19/%{name}-%{version}.tar.bz2
 Source1: redhat-default-session
@@ -185,6 +185,9 @@ fi
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Fri Aug 10 2007 Kristian Høgsberg <krh@redhat.com> - 2.19.6-5
+- Edit window manager patch again to add 'glib' to compiz launch.
+
 * Thu Aug  9 2007 Kristian Høgsberg <krh@redhat.com> - 2.19.6-4
 - Edit the right window manager patch and delete the old one.