From a5d06b6ac622d58bc9c5f1b1e23f4c5fef7149ee5ca83141cb26142b82b37211 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 14 Jan 2011 14:26:58 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/gdm revision 105.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=fd24d133eb13589d70fe9c926627be9e --- gdm.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gdm.spec b/gdm.spec index 871c0f4..54569fe 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,7 +1,7 @@ # -# spec file for package gdm (Version 2.32.0) +# spec file for package gdm # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -42,7 +42,7 @@ BuildRequires: zenity License: GPLv2+ Group: System/GUI/GNOME Version: 2.32.0 -Release: 1 +Release: 2 Summary: The GNOME Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd From 585922d5678d7d0b791f486217fc61a9b0c43afe72be72637ca4514e60ff6f7b Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 14 Jan 2011 17:58:21 +0000 Subject: [PATCH 2/2] Accepting request 58282 from home:vuntz:branches:GNOME:Factory Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/58282 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=150 --- gdm-vt-allocation-hack.patch | 24 ++++++++++++------------ gdm.changes | 14 ++++++++++++++ gdm.spec | 6 +++--- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/gdm-vt-allocation-hack.patch b/gdm-vt-allocation-hack.patch index 40fa8ea..42461d6 100644 --- a/gdm-vt-allocation-hack.patch +++ b/gdm-vt-allocation-hack.patch @@ -1,17 +1,17 @@ -Index: gdm-2.31.2/daemon/gdm-server.c +Index: gdm-2.32.0/daemon/gdm-server.c =================================================================== ---- gdm-2.31.2.orig/daemon/gdm-server.c -+++ gdm-2.31.2/daemon/gdm-server.c -@@ -33,6 +33,8 @@ - #include - #include - #include +--- gdm-2.32.0.orig/daemon/gdm-server.c ++++ gdm-2.32.0/daemon/gdm-server.c +@@ -27,6 +27,8 @@ + #include + #include + #include +#include +#include - - #ifdef HAVE_SYS_PRCTL_H - #include -@@ -154,6 +156,92 @@ _gdm_server_query_ck_for_display_device + #include + #include + #include +@@ -157,6 +159,92 @@ _gdm_server_query_ck_for_display_device return out; } @@ -104,7 +104,7 @@ Index: gdm-2.31.2/daemon/gdm-server.c char * gdm_server_get_display_device (GdmServer *server) { -@@ -314,6 +402,11 @@ gdm_server_resolve_command_line (GdmServ +@@ -317,6 +405,11 @@ gdm_server_resolve_command_line (GdmServ if (vtarg != NULL && ! gotvtarg) { argv[len++] = g_strdup (vtarg); diff --git a/gdm.changes b/gdm.changes index bd27094..d485928 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Jan 14 18:51:02 CET 2011 - vuntz@opensuse.org + +- Rebase gdm-vt-allocation-hack.patch to actually apply. +- Apply gdm-vt-allocation-hack.patch on 11.4 and later again: the + topic needs more discussion, and without the hack, on a default + boot, a mingetty instance will receive all the input from Xorg. + This is because Xorg will start on tty2 and a mingetty will also + start there, because of the sysvinit configration. This is + extremely bad, since this means everything the user types will + lead to login attemps in mingetty. +- Add gnome-power-manager and iso-codes Recommends: they are both + improving the gdm experience, but are not mandatory. + ------------------------------------------------------------------- Tue Jan 11 12:57:17 CET 2011 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index 54569fe..71ac403 100644 --- a/gdm.spec +++ b/gdm.spec @@ -55,7 +55,7 @@ Patch1: gdm-plymouth-X-nr.patch Patch2: gdm-helper-directory.patch # PATCH-FIX-OPENSUSE gdm-is-not-unstable-unless.patch vuntz@opensuse.org -- Make gdm think it's never running a development version unless SUSE_ENABLE_UNSTABLE_CHECK is set. This disables fatal warnings as well as abusive log Patch3: gdm-is-not-unstable-unless.patch -# PATCH-FIX-UPSTREAM gdm-vt-allocation-hack.patch bgo511168 hpj@novell.com -- Needed for user switching. Needed only for 11.3 and earlier +# PATCH-FIX-UPSTREAM gdm-vt-allocation-hack.patch bgo511168 hpj@novell.com -- Needed for user switching Patch4: gdm-vt-allocation-hack.patch # PATCH-FIX-UPSTREAM gdm-focus-user-chooser.patch bgo#629310 bnc#652938 vuntz@opensuse.org -- Correctly give the focus to the user chooser on startup Patch5: gdm-focus-user-chooser.patch @@ -102,7 +102,9 @@ Requires: xorg-x11-server-extra # For groupadd, useradd, usermod PreReq: pwdutils PreReq: %insserv_prereq +Recommends: gnome-power-manager Recommends: gnome-settings-daemon +Recommends: iso-codes %gconf_schemas_prereq %description @@ -150,9 +152,7 @@ translation-update-upstream %patch1 -p1 %patch2 -p1 %patch3 -p1 -%if 0%{?suse_version} <= 1130 %patch4 -p1 -%endif %patch5 -p1 %patch6 -p1 %patch7 -p1