diff --git a/gdm-2.20.1-suspend.patch b/gdm-2.20.1-suspend.patch deleted file mode 100644 index d7004aa..0000000 --- a/gdm-2.20.1-suspend.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ru gdm-2.20.1.orig/daemon/gdm.c gdm-2.20.1/daemon/gdm.c ---- gdm-2.20.1.orig/daemon/gdm.c 2007-11-28 21:25:22.000000000 -0800 -+++ gdm-2.20.1/daemon/gdm.c 2007-11-28 19:17:45.000000000 -0800 -@@ -2538,7 +2538,7 @@ - gdm_info (_("Master suspending...")); - - sysmenu = gdm_daemon_config_get_value_bool_per_display (GDM_KEY_SYSTEM_MENU, d->name); -- if (sysmenu && gdm_daemon_config_get_value_string (GDM_KEY_SUSPEND) != NULL) { -+ if (sysmenu && gdm_daemon_config_get_value_string_array (GDM_KEY_SUSPEND) != NULL) { - suspend_machine (); - } - } else if (strncmp (msg, GDM_SOP_CHOSEN_THEME " ", -diff -ru gdm-2.20.1.orig/daemon/slave.c gdm-2.20.1/daemon/slave.c ---- gdm-2.20.1.orig/daemon/slave.c 2007-11-28 21:25:22.000000000 -0800 -+++ gdm-2.20.1/daemon/slave.c 2007-11-28 19:13:22.000000000 -0800 -@@ -5512,7 +5512,7 @@ - case GDM_INTERRUPT_SUSPEND: - if (d->attached && - gdm_daemon_config_get_value_bool_per_display (GDM_KEY_SYSTEM_MENU, d->name) && -- ! ve_string_empty (gdm_daemon_config_get_value_string (GDM_KEY_SUSPEND))) { -+ ! ve_string_empty (gdm_daemon_config_get_value_string_array (GDM_KEY_SUSPEND))) { - gchar *msg = g_strdup_printf ("%s %ld", - GDM_SOP_SUSPEND_MACHINE, - (long)getpid ()); diff --git a/gdm.spec b/gdm.spec index be39d3b..2e6443d 100644 --- a/gdm.spec +++ b/gdm.spec @@ -65,9 +65,6 @@ Patch43: gdm-2.20.1-keymouselistener-segfault.patch # FIXME need to file upstream and get fixed in 2.20 Patch44: gdm-2.18.4-tcp-wrappers.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=500362 -Patch45: gdm-2.20.1-suspend.patch - Patch100: gdm-2.20.2-change-defaults.patch Patch101: stupid-bullets.patch @@ -157,7 +154,6 @@ Extra icons / faces for the GNOME Display Manager. %patch41 -p1 -b .pixbuf-ref %patch43 -p1 -b .keymouselistener-segfault %patch44 -p1 -b .tcp-wrappers -%patch45 -p1 -b .suspend %patch100 -p1 -b .change-defaults %patch101 -p1 -b .stupid-bullets @@ -374,7 +370,7 @@ fi %changelog * Tue Jan 08 2008 - Bastien Nocera - 1:2.20.3-1 - Update to 2.20.3 -- Remove obsolete patch +- Remove obsolete patches * Fri Dec 7 2007 Ray Strode - 1:2.20.2-3 - increase X server startup timeout, since 10 seconds is too short