rpms/gnome-session/devel gnome-session-2.17.5-window-manager.patch, 1.4, 1.5 gnome-session.spec, 1.137, 1.138

[Kristian Høgsberg (krh)]

Author: krh

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

Modified Files:
	gnome-session-2.17.5-window-manager.patch gnome-session.spec 
Log Message:
* Wed Sep  5 2007 Kristian Høgsberg <krh at redhat.com> - 2.19.92-2
- Update gnome-session-2.17.5-window-manager.patch to apply (remove
  chunks that are now upstream).


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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-session-2.17.5-window-manager.patch	10 Aug 2007 19:09:52 -0000	1.4
+++ gnome-session-2.17.5-window-manager.patch	5 Sep 2007 17:30:41 -0000	1.5
@@ -49,30 +49,3 @@
  
  if [ -z "$WINDOW_MANAGER" ] ; then
    # Create a list of window manager we can handle, trying to only use the
-@@ -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=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!"


Index: gnome-session.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- gnome-session.spec	4 Sep 2007 19:27:48 -0000	1.137
+++ gnome-session.spec	5 Sep 2007 17:30:41 -0000	1.138
@@ -12,7 +12,7 @@
 Summary: GNOME session manager
 Name: gnome-session
 Version: 2.19.92
-Release: 1%{?dist}
+Release: 2%{?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,10 @@
 %doc %{_datadir}/man/man*/*
 
 %changelog
+* Wed Sep  5 2007 Kristian Høgsberg <krh at redhat.com> - 2.19.92-2
+- Update gnome-session-2.17.5-window-manager.patch to apply (remove
+  chunks that are now upstream).
+
 * Tue Sep  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.19.92-1
 - Update to 2.19.92