rpms/gnome-session/devel gnome-session-2.17.5-window-manager.patch, 1.5, 1.6 gnome-session-2.2.2-icons.patch, 1.2, 1.3 gnome-session.spec, 1.158, 1.159

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	gnome-session-2.17.5-window-manager.patch 
	gnome-session-2.2.2-icons.patch gnome-session.spec 
Log Message:
try again


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

Index: gnome-session-2.17.5-window-manager.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session-2.17.5-window-manager.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-session-2.17.5-window-manager.patch	5 Sep 2007 17:30:41 -0000	1.5
+++ gnome-session-2.17.5-window-manager.patch	25 Apr 2008 20:36:23 -0000	1.6
@@ -25,9 +25,9 @@
           <locale name="C">
              <short>Show the splash screen</short>
              <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-10 15:01:04.000000000 -0400
+diff -up gnome-session-2.19.6/data/gnome-wm.window-manager gnome-session-2.19.6/data/gnome-wm
+--- gnome-session-2.19.6/data/gnome-wm.window-manager	2007-07-30 16:07:15.000000000 -0400
++++ gnome-session-2.19.6/data/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.

gnome-session-2.2.2-icons.patch:

Index: gnome-session-2.2.2-icons.patch
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session-2.2.2-icons.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-session-2.2.2-icons.patch	9 Sep 2004 05:35:10 -0000	1.2
+++ gnome-session-2.2.2-icons.patch	25 Apr 2008 20:36:23 -0000	1.3
@@ -1,5 +1,5 @@
---- gnome-session-2.5.90/gnome-session/splash-widget.c.icons	2004-02-24 14:13:22.000000000 +0000
-+++ gnome-session-2.5.90/gnome-session/splash-widget.c	2004-02-24 14:14:24.000000000 +0000
+--- gnome-session-2.5.90/splash/splash-widget.c.icons	2004-02-24 14:13:22.000000000 +0000
++++ gnome-session-2.5.90/splash/splash-widget.c	2004-02-24 14:14:24.000000000 +0000
 @@ -46,7 +46,11 @@
  	{ N_("The Panel"),               "gnome-panel",           "gnome-panel" },
  	{ N_("Session Manager Proxy"),   "gnome-smproxy",         "gnome-session" },


Index: gnome-session.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-session/devel/gnome-session.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- gnome-session.spec	25 Apr 2008 20:16:55 -0000	1.158
+++ gnome-session.spec	25 Apr 2008 20:36:23 -0000	1.159
@@ -11,7 +11,7 @@
 
 Summary: GNOME session manager
 Name: gnome-session
-Version: 2.23.1
+Version: 2.23.1.1
 Release: 1%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/gnome-session/2.23/%{name}-%{version}.tar.bz2
@@ -33,18 +33,19 @@
 ## we conflict with gdm that contains the GNOME gdm xsession
 Conflicts: gdm < 1:2.6.0.8-5
 
-Patch1: gnome-session-2.2.2-icons.patch
+# FIXME does this still apply ?
+#Patch1: gnome-session-2.2.2-icons.patch
 
-# too much crashing
-Patch9: gnome-session-2.13.4-no-crashes.patch
+# FIXME does this still apply ?
+#Patch9: gnome-session-2.13.4-no-crashes.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=350848
 # The gconf bits weren't accepted upstream, so we'll
 # need to figure something out here
 Patch13: gnome-session-2.17.5-window-manager.patch
 
-# don't pop up the dialog as it can take longer than 5 seconds
-Patch20: gnome-session-2.19.4-atspi-timeout.patch
+# FIXME does this still apply ?
+#Patch20: gnome-session-2.19.4-atspi-timeout.patch
 
 # http://bugzilla.gnome.org/show_bug.cgi?id=411506
 #Patch21: gnome-session-2.17.91-use-gdm-at-hints-3.patch
@@ -88,10 +89,10 @@
 %prep
 %setup -q
 
-%patch1 -p1 -b .icons
-%patch9 -p1 -b .no-crashes
+#%patch1 -p1 -b .icons
+#%patch9 -p1 -b .no-crashes
 %patch13 -p1 -b .window-manager
-%patch20 -p1 -b .timeout
+#%patch20 -p1 -b .timeout
 #%patch21 -p0 -b .use-gdm-hints
 #%patch22 -p1 -b .ice-leaks