From f67b58845c161cdd473d18c752250bda6f69d022 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 25 Apr 2008 20:36:23 +0000 Subject: [PATCH] try again --- gnome-session-2.17.5-window-manager.patch | 6 +++--- gnome-session-2.2.2-icons.patch | 4 ++-- gnome-session.spec | 19 ++++++++++--------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/gnome-session-2.17.5-window-manager.patch b/gnome-session-2.17.5-window-manager.patch index 11995a9..22d86ae 100644 --- a/gnome-session-2.17.5-window-manager.patch +++ b/gnome-session-2.17.5-window-manager.patch @@ -25,9 +25,9 @@ diff -up gnome-session-2.19.6/data/gnome-session.schemas.in.window-manager gnome Show the splash screen Show the splash screen when the session starts up -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. diff --git a/gnome-session-2.2.2-icons.patch b/gnome-session-2.2.2-icons.patch index 1d3b271..6fa93b7 100644 --- a/gnome-session-2.2.2-icons.patch +++ b/gnome-session-2.2.2-icons.patch @@ -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" }, diff --git a/gnome-session.spec b/gnome-session.spec index f54d226..18d1b76 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -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 @@ Requires: dbus-x11 ## 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 @@ GNOME components and handles logout and saving the session. %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