rpms/gnome-session/devel gnome-session-2.17.5-window-manager.patch, 1.2, 1.3 gnome-session.spec, 1.132, 1.133 gnome-session-2.15.90-window-manager.patch, 1.5, NONE

[Kristian Høgsberg (krh)]

Author: krh

Update of /cvs/pkgs/rpms/gnome-session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21460

Modified Files:
	gnome-session-2.17.5-window-manager.patch gnome-session.spec 
Removed Files:
	gnome-session-2.15.90-window-manager.patch 
Log Message:
* Thu Aug  9 2007 Kristian Høgsberg <krh at redhat.com> - 2.19.6-4
- Edit the right window manager patch and delete the old one.


gnome-session-2.17.5-window-manager.patch:

Index: gnome-session-2.17.5-window-manager.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session-2.17.5-window-manager.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-session-2.17.5-window-manager.patch	22 Jan 2007 04:58:32 -0000	1.2
+++ gnome-session-2.17.5-window-manager.patch	9 Aug 2007 21:46:42 -0000	1.3
@@ -1,5 +1,6 @@
---- gnome-session-2.17.5/data/gnome-session.schemas.in.window-manager	2007-01-08 17:32:28.000000000 -0500
-+++ gnome-session-2.17.5/data/gnome-session.schemas.in	2007-01-11 14:05:30.000000000 -0500
+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
 @@ -2,11 +2,22 @@
  <gconfschemafile>
     <schemalist>
@@ -24,8 +25,9 @@
           <locale name="C">
              <short>Show the splash screen</short>
              <long>Show the splash screen when the session starts up</long>
---- gnome-session-2.17.5/gnome-session/gnome-wm.window-manager	2007-01-08 17:32:28.000000000 -0500
-+++ gnome-session-2.17.5/gnome-session/gnome-wm	2007-01-11 14:08:11.000000000 -0500
+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
 @@ -3,7 +3,9 @@
  # The user can specify his prefered WM by setting the WINDOW_MANAGER
  # environment variable.
@@ -37,7 +39,7 @@
  # the first one that is found in the users's PATH
  #
  
-@@ -38,6 +40,9 @@
+@@ -38,6 +40,9 @@ for n in "$@" ; do
  done
  
  # WINDOW_MANAGER overrides all
@@ -47,3 +49,11 @@
  
  if [ -z "$WINDOW_MANAGER" ] ; then
    # Create a list of window manager we can handle, trying to only use the
+@@ -117,6 +122,7 @@ fi
+ 
+ case `basename $WINDOW_MANAGER` in
+   compiz)
++    export LIBGL_ALWAYS_INDIRECT=1
+     gtk-window-decorator &
+     OPT3=gconf
+     ;;


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- gnome-session.spec	9 Aug 2007 21:24:04 -0000	1.132
+++ gnome-session.spec	9 Aug 2007 21:46:42 -0000	1.133
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.19.6
-Release: 3%{?dist}
+Release: 4%{?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 @@
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Thu Aug  9 2007 Kristian Høgsberg <krh at redhat.com> - 2.19.6-4
+- Edit the right window manager patch and delete the old one.
+
 * Thu Aug  9 2007 Kristian Høgsberg <krh at redhat.com> - 2.19.6-3
 - Export LIBGL_ALWAYS_INDIRECT before starting compiz.
 


--- gnome-session-2.15.90-window-manager.patch DELETED ---