From 35d14f847dde3c070e1afe313bb04b26caed94d66a2a3fd1eff9455142f949e1 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 8 Apr 2010 17:50:47 +0000 Subject: [PATCH 1/4] Accepting request 37432 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 37432 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/37432 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=122 --- gdm.changes | 7 +++++++ gdm.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gdm.changes b/gdm.changes index f2586b4..141dbdd 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 8 02:02:20 CEST 2010 - vuntz@opensuse.org + +- Use the path for the at-spi-registryd from the old at-spi stack: + the at-spi2 developers think it's safer to ship 11.3 with the old + stack by default. + ------------------------------------------------------------------- Tue Mar 30 01:43:33 CEST 2010 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index ddeeb22..08d8bf8 100644 --- a/gdm.spec +++ b/gdm.spec @@ -162,7 +162,7 @@ autoreconf -f -i %configure\ --libexecdir=%{_prefix}/lib/gdm \ --localstatedir=%{_localstatedir} \ - --with-at-spi-registryd-directory=%{_libexecdir}/at-spi2 \ + --with-at-spi-registryd-directory=%{_libexecdir}/at-spi \ --with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon \ --with-consolekit-directory=%{_libexecdir}/ConsoleKit \ --with-polkit-gnome-directory=%{_libexecdir}/polkit-gnome \ From f9e71fc069946fd7ad390f7d7078d909f3a1adfb96865abda56965bed0ab2024 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 13 May 2010 20:54:49 +0000 Subject: [PATCH 2/4] Accepting request 39880 from home:MBoman:branches:GNOME:Factory Copy from home:MBoman:branches:GNOME:Factory/gdm via accept of submit request 39880 revision 5. Request was accepted with message: Ok with me. As an addon: maybe create a bnc entry assigned to vuntz to respin the ui patch. OBS-URL: https://build.opensuse.org/request/show/39880 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=123 --- gdm-2.30.0.tar.bz2 | 3 --- gdm-2.30.2.tar.bz2 | 3 +++ gdm-polkit-gnome-path.patch | 8 ++++---- gdm-xauthlocalhostname.patch | 38 ++++++++++++++++++------------------ gdm.changes | 35 +++++++++++++++++++++++++++++++++ gdm.spec | 13 ++++++------ 6 files changed, 68 insertions(+), 32 deletions(-) delete mode 100644 gdm-2.30.0.tar.bz2 create mode 100644 gdm-2.30.2.tar.bz2 diff --git a/gdm-2.30.0.tar.bz2 b/gdm-2.30.0.tar.bz2 deleted file mode 100644 index 767f09d..0000000 --- a/gdm-2.30.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac2c367766b8fa20ebeb41033931fc4d91482ad3d377823f1c7ad84eee12dc15 -size 2291133 diff --git a/gdm-2.30.2.tar.bz2 b/gdm-2.30.2.tar.bz2 new file mode 100644 index 0000000..5d2cd67 --- /dev/null +++ b/gdm-2.30.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:884f4816a78f8f1eece8f1468f19dc01c5350d4a3513d3c0e854f45f870c1ec5 +size 2381359 diff --git a/gdm-polkit-gnome-path.patch b/gdm-polkit-gnome-path.patch index 9d4f3d4..84c4963 100644 --- a/gdm-polkit-gnome-path.patch +++ b/gdm-polkit-gnome-path.patch @@ -1,11 +1,11 @@ -Index: gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in +Index: data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in =================================================================== ---- gdm-2.28.0.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in -+++ gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in +--- data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.orig 2010-04-27 23:51:57.000000000 +1000 ++++ data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in 2010-05-07 08:08:26.000000000 +1000 @@ -1,5 +1,5 @@ [Desktop Entry] Type=Application _Name=PolicyKit Authentication Agent --Exec=/usr/lib/polkit-gnome-authentication-agent-1 +-Exec=/usr/libexec/polkit-gnome-authentication-agent-1 +Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 OnlyShowIn=GNOME; diff --git a/gdm-xauthlocalhostname.patch b/gdm-xauthlocalhostname.patch index ec928bf..42635a1 100644 --- a/gdm-xauthlocalhostname.patch +++ b/gdm-xauthlocalhostname.patch @@ -1,7 +1,7 @@ -Index: gdm-2.27.90/daemon/gdm-display-access-file.c +Index: daemon/gdm-display-access-file.c =================================================================== ---- gdm-2.27.90.orig/daemon/gdm-display-access-file.c -+++ gdm-2.27.90/daemon/gdm-display-access-file.c +--- daemon/gdm-display-access-file.c.orig 2010-03-18 08:27:16.000000000 +1100 ++++ daemon/gdm-display-access-file.c 2010-05-11 07:44:22.000000000 +1000 @@ -440,11 +440,15 @@ _get_auth_info_for_display (GdmDisplayAc if (is_local) { char localhost[HOST_NAME_MAX + 1] = ""; @@ -18,13 +18,13 @@ Index: gdm-2.27.90/daemon/gdm-display-access-file.c } else { *family = FamilyWild; gdm_display_get_remote_hostname (display, address, NULL); -Index: gdm-2.27.90/daemon/gdm-session-direct.c +Index: daemon/gdm-session-direct.c =================================================================== ---- gdm-2.27.90.orig/daemon/gdm-session-direct.c -+++ gdm-2.27.90/daemon/gdm-session-direct.c -@@ -2050,6 +2050,12 @@ setup_session_environment (GdmSessionDir - session->priv->user_x11_authority_file); - } +--- daemon/gdm-session-direct.c.orig 2010-05-11 07:44:20.000000000 +1000 ++++ daemon/gdm-session-direct.c 2010-05-11 07:44:22.000000000 +1000 +@@ -2075,6 +2075,12 @@ setup_session_environment (GdmSessionDir + g_getenv ("WINDOWPATH")); + + if (session->priv->display_is_local) { + gdm_session_direct_set_environment_variable (session, @@ -35,11 +35,11 @@ Index: gdm-2.27.90/daemon/gdm-session-direct.c /* FIXME: We do this here and in the session worker. We should consolidate * somehow. */ -Index: gdm-2.27.90/daemon/gdm-slave.c +Index: daemon/gdm-slave.c =================================================================== ---- gdm-2.27.90.orig/daemon/gdm-slave.c -+++ gdm-2.27.90/daemon/gdm-slave.c -@@ -222,6 +222,10 @@ get_script_environment (GdmSlave *slav +--- daemon/gdm-slave.c.orig 2010-04-27 23:48:54.000000000 +1000 ++++ daemon/gdm-slave.c 2010-05-11 07:44:22.000000000 +1000 +@@ -233,6 +233,10 @@ get_script_environment (GdmSlave *slav g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup (slave->priv->display_hostname)); } @@ -50,7 +50,7 @@ Index: gdm-2.27.90/daemon/gdm-slave.c /* Runs as root */ g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (slave->priv->display_x11_authority_file)); g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (slave->priv->display_name)); -@@ -374,6 +378,7 @@ gdm_slave_connect_to_x11_display (GdmSla +@@ -481,6 +485,7 @@ gdm_slave_connect_to_x11_display (GdmSla g_setenv ("DISPLAY", slave->priv->display_name, TRUE); g_setenv ("XAUTHORITY", slave->priv->display_x11_authority_file, TRUE); @@ -58,11 +58,11 @@ Index: gdm-2.27.90/daemon/gdm-slave.c sigemptyset (&mask); sigaddset (&mask, SIGCHLD); -Index: gdm-2.27.90/daemon/gdm-welcome-session.c +Index: daemon/gdm-welcome-session.c =================================================================== ---- gdm-2.27.90.orig/daemon/gdm-welcome-session.c -+++ gdm-2.27.90/daemon/gdm-welcome-session.c -@@ -315,6 +315,10 @@ get_welcome_environment (GdmWelcomeSessi +--- daemon/gdm-welcome-session.c.orig 2010-04-27 03:08:42.000000000 +1000 ++++ daemon/gdm-welcome-session.c 2010-05-11 07:44:22.000000000 +1000 +@@ -420,6 +420,10 @@ get_welcome_environment (GdmWelcomeSessi g_hash_table_insert (hash, g_strdup ("SHELL"), g_strdup (pwent->pw_shell)); } @@ -72,4 +72,4 @@ Index: gdm-2.27.90/daemon/gdm-welcome-session.c + } g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH"))); - + g_hash_table_insert (hash, g_strdup ("WINDOWPATH"), g_strdup (g_getenv ("WINDOWPATH"))); diff --git a/gdm.changes b/gdm.changes index 141dbdd..7a0422f 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Fri May 7 00:03:41 CEST 2010 - captain.magnus@opensuse.org + +- Update to version 2.30.2: + + Accessibility is now enabled by default for the GDM login + screen + + When the face browser is disabled, the PAM conversation is + started immediately, so users do not need to click a button to + start entering the username and password. bgo#591082 + + Add label-for and labelled-by a11y relations to the entry field + in the login GUI. This makes the login GUI more accessible when + using AT programs. bgo#613434 + + Fixed bugs that were causing XDMCP to not show the greeter + again after logout. bgo#606724 + + The default XDMCP PingIntervalSeconds was increased from 15 to + 60 seconds + + The WINDOWPATH environment variable is now set for the user + session. bgo#609272 + + Ensure Init script is called when using Automatic Login. + bgo#614488 + + Fix race condition with Timed Login. bgo#614062 + + Drop xhost localuser:gdm and localuser:root when the user + session starts. bgo#605350 + + Removed the icon monitor from the GDM login GUI since it was + not functional and was causing problems with automounting + user's HOME directories. #609321 + + Do not mark "%x" for translation. bgo#613306 + + Remove duplicated strings for translation. bgo#609179 + + Minor doc corrections + + Translation updates +- gdm-greeter-greater-ui.patch does not apply and is commented out + temporarily +- Respin gdm-xauthlocalhostname.patch for fuzz=0 +- Respin gdm-polkit-gnome-path.patch + ------------------------------------------------------------------- Thu Apr 8 02:02:20 CEST 2010 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index 08d8bf8..75394a3 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,5 +1,5 @@ # -# spec file for package gdm (Version 2.30.0) +# spec file for package gdm (Version 2.30.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -41,7 +41,7 @@ BuildRequires: xorg-x11-server-extra BuildRequires: zenity License: GPLv2+ Group: System/GUI/GNOME -Version: 2.30.0 +Version: 2.30.2 Release: 1 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 @@ -63,7 +63,7 @@ Patch7: gdm-suse-xsession.patch Patch8: gdm-sysconfig-settings.patch # PATCH-FEATURE-SLED gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain Patch9: gdm-domain-logon.patch -# PATCH-FIX-UPSTREAM gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) +# PATCH-NEEDS-REBASE (was PATCH-FIX-UPSTREAM) gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) Patch15: gdm-greeter-greater-ui.patch # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. Patch18: gdm-always-reflect-keyboard-layout.patch @@ -142,15 +142,16 @@ gnome-patch-translation-prepare %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch15 -p1 +#FIXME - Needs rebase +#%patch15 -p1 %patch18 -p1 %patch19 -p1 %patch20 -p1 %patch31 -p1 %patch34 -p1 -%patch35 -p1 +%patch35 -p0 %patch37 -p1 -%patch39 -p1 +%patch39 -p0 %patch40 -p1 %patch41 -p1 %patch60 From 38db3a8fa38d3acaf32ce5ae629223cdf4b01c9e42140c67075174d339691d89 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 13 May 2010 22:43:10 +0000 Subject: [PATCH 3/4] Accepting request 39936 from GNOME:Factory checked in (request 39936) OBS-URL: https://build.opensuse.org/request/show/39936 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=124 --- gdm-2.30.0.tar.bz2 | 3 +++ gdm-2.30.2.tar.bz2 | 3 --- gdm-polkit-gnome-path.patch | 8 +++---- gdm-xauthlocalhostname.patch | 38 ++++++++++++++++---------------- gdm.changes | 42 ------------------------------------ gdm.spec | 15 ++++++------- 6 files changed, 33 insertions(+), 76 deletions(-) create mode 100644 gdm-2.30.0.tar.bz2 delete mode 100644 gdm-2.30.2.tar.bz2 diff --git a/gdm-2.30.0.tar.bz2 b/gdm-2.30.0.tar.bz2 new file mode 100644 index 0000000..767f09d --- /dev/null +++ b/gdm-2.30.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac2c367766b8fa20ebeb41033931fc4d91482ad3d377823f1c7ad84eee12dc15 +size 2291133 diff --git a/gdm-2.30.2.tar.bz2 b/gdm-2.30.2.tar.bz2 deleted file mode 100644 index 5d2cd67..0000000 --- a/gdm-2.30.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:884f4816a78f8f1eece8f1468f19dc01c5350d4a3513d3c0e854f45f870c1ec5 -size 2381359 diff --git a/gdm-polkit-gnome-path.patch b/gdm-polkit-gnome-path.patch index 84c4963..9d4f3d4 100644 --- a/gdm-polkit-gnome-path.patch +++ b/gdm-polkit-gnome-path.patch @@ -1,11 +1,11 @@ -Index: data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in +Index: gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in =================================================================== ---- data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.orig 2010-04-27 23:51:57.000000000 +1000 -+++ data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in 2010-05-07 08:08:26.000000000 +1000 +--- gdm-2.28.0.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in ++++ gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in @@ -1,5 +1,5 @@ [Desktop Entry] Type=Application _Name=PolicyKit Authentication Agent --Exec=/usr/libexec/polkit-gnome-authentication-agent-1 +-Exec=/usr/lib/polkit-gnome-authentication-agent-1 +Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 OnlyShowIn=GNOME; diff --git a/gdm-xauthlocalhostname.patch b/gdm-xauthlocalhostname.patch index 42635a1..ec928bf 100644 --- a/gdm-xauthlocalhostname.patch +++ b/gdm-xauthlocalhostname.patch @@ -1,7 +1,7 @@ -Index: daemon/gdm-display-access-file.c +Index: gdm-2.27.90/daemon/gdm-display-access-file.c =================================================================== ---- daemon/gdm-display-access-file.c.orig 2010-03-18 08:27:16.000000000 +1100 -+++ daemon/gdm-display-access-file.c 2010-05-11 07:44:22.000000000 +1000 +--- gdm-2.27.90.orig/daemon/gdm-display-access-file.c ++++ gdm-2.27.90/daemon/gdm-display-access-file.c @@ -440,11 +440,15 @@ _get_auth_info_for_display (GdmDisplayAc if (is_local) { char localhost[HOST_NAME_MAX + 1] = ""; @@ -18,13 +18,13 @@ Index: daemon/gdm-display-access-file.c } else { *family = FamilyWild; gdm_display_get_remote_hostname (display, address, NULL); -Index: daemon/gdm-session-direct.c +Index: gdm-2.27.90/daemon/gdm-session-direct.c =================================================================== ---- daemon/gdm-session-direct.c.orig 2010-05-11 07:44:20.000000000 +1000 -+++ daemon/gdm-session-direct.c 2010-05-11 07:44:22.000000000 +1000 -@@ -2075,6 +2075,12 @@ setup_session_environment (GdmSessionDir - g_getenv ("WINDOWPATH")); - +--- gdm-2.27.90.orig/daemon/gdm-session-direct.c ++++ gdm-2.27.90/daemon/gdm-session-direct.c +@@ -2050,6 +2050,12 @@ setup_session_environment (GdmSessionDir + session->priv->user_x11_authority_file); + } + if (session->priv->display_is_local) { + gdm_session_direct_set_environment_variable (session, @@ -35,11 +35,11 @@ Index: daemon/gdm-session-direct.c /* FIXME: We do this here and in the session worker. We should consolidate * somehow. */ -Index: daemon/gdm-slave.c +Index: gdm-2.27.90/daemon/gdm-slave.c =================================================================== ---- daemon/gdm-slave.c.orig 2010-04-27 23:48:54.000000000 +1000 -+++ daemon/gdm-slave.c 2010-05-11 07:44:22.000000000 +1000 -@@ -233,6 +233,10 @@ get_script_environment (GdmSlave *slav +--- gdm-2.27.90.orig/daemon/gdm-slave.c ++++ gdm-2.27.90/daemon/gdm-slave.c +@@ -222,6 +222,10 @@ get_script_environment (GdmSlave *slav g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup (slave->priv->display_hostname)); } @@ -50,7 +50,7 @@ Index: daemon/gdm-slave.c /* Runs as root */ g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (slave->priv->display_x11_authority_file)); g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (slave->priv->display_name)); -@@ -481,6 +485,7 @@ gdm_slave_connect_to_x11_display (GdmSla +@@ -374,6 +378,7 @@ gdm_slave_connect_to_x11_display (GdmSla g_setenv ("DISPLAY", slave->priv->display_name, TRUE); g_setenv ("XAUTHORITY", slave->priv->display_x11_authority_file, TRUE); @@ -58,11 +58,11 @@ Index: daemon/gdm-slave.c sigemptyset (&mask); sigaddset (&mask, SIGCHLD); -Index: daemon/gdm-welcome-session.c +Index: gdm-2.27.90/daemon/gdm-welcome-session.c =================================================================== ---- daemon/gdm-welcome-session.c.orig 2010-04-27 03:08:42.000000000 +1000 -+++ daemon/gdm-welcome-session.c 2010-05-11 07:44:22.000000000 +1000 -@@ -420,6 +420,10 @@ get_welcome_environment (GdmWelcomeSessi +--- gdm-2.27.90.orig/daemon/gdm-welcome-session.c ++++ gdm-2.27.90/daemon/gdm-welcome-session.c +@@ -315,6 +315,10 @@ get_welcome_environment (GdmWelcomeSessi g_hash_table_insert (hash, g_strdup ("SHELL"), g_strdup (pwent->pw_shell)); } @@ -72,4 +72,4 @@ Index: daemon/gdm-welcome-session.c + } g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH"))); - g_hash_table_insert (hash, g_strdup ("WINDOWPATH"), g_strdup (g_getenv ("WINDOWPATH"))); + diff --git a/gdm.changes b/gdm.changes index 7a0422f..f2586b4 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,45 +1,3 @@ -------------------------------------------------------------------- -Fri May 7 00:03:41 CEST 2010 - captain.magnus@opensuse.org - -- Update to version 2.30.2: - + Accessibility is now enabled by default for the GDM login - screen - + When the face browser is disabled, the PAM conversation is - started immediately, so users do not need to click a button to - start entering the username and password. bgo#591082 - + Add label-for and labelled-by a11y relations to the entry field - in the login GUI. This makes the login GUI more accessible when - using AT programs. bgo#613434 - + Fixed bugs that were causing XDMCP to not show the greeter - again after logout. bgo#606724 - + The default XDMCP PingIntervalSeconds was increased from 15 to - 60 seconds - + The WINDOWPATH environment variable is now set for the user - session. bgo#609272 - + Ensure Init script is called when using Automatic Login. - bgo#614488 - + Fix race condition with Timed Login. bgo#614062 - + Drop xhost localuser:gdm and localuser:root when the user - session starts. bgo#605350 - + Removed the icon monitor from the GDM login GUI since it was - not functional and was causing problems with automounting - user's HOME directories. #609321 - + Do not mark "%x" for translation. bgo#613306 - + Remove duplicated strings for translation. bgo#609179 - + Minor doc corrections - + Translation updates -- gdm-greeter-greater-ui.patch does not apply and is commented out - temporarily -- Respin gdm-xauthlocalhostname.patch for fuzz=0 -- Respin gdm-polkit-gnome-path.patch - -------------------------------------------------------------------- -Thu Apr 8 02:02:20 CEST 2010 - vuntz@opensuse.org - -- Use the path for the at-spi-registryd from the old at-spi stack: - the at-spi2 developers think it's safer to ship 11.3 with the old - stack by default. - ------------------------------------------------------------------- Tue Mar 30 01:43:33 CEST 2010 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index 75394a3..ddeeb22 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,5 +1,5 @@ # -# spec file for package gdm (Version 2.30.2) +# spec file for package gdm (Version 2.30.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -41,7 +41,7 @@ BuildRequires: xorg-x11-server-extra BuildRequires: zenity License: GPLv2+ Group: System/GUI/GNOME -Version: 2.30.2 +Version: 2.30.0 Release: 1 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 @@ -63,7 +63,7 @@ Patch7: gdm-suse-xsession.patch Patch8: gdm-sysconfig-settings.patch # PATCH-FEATURE-SLED gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain Patch9: gdm-domain-logon.patch -# PATCH-NEEDS-REBASE (was PATCH-FIX-UPSTREAM) gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) +# PATCH-FIX-UPSTREAM gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) Patch15: gdm-greeter-greater-ui.patch # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. Patch18: gdm-always-reflect-keyboard-layout.patch @@ -142,16 +142,15 @@ gnome-patch-translation-prepare %patch7 -p1 %patch8 -p1 %patch9 -p1 -#FIXME - Needs rebase -#%patch15 -p1 +%patch15 -p1 %patch18 -p1 %patch19 -p1 %patch20 -p1 %patch31 -p1 %patch34 -p1 -%patch35 -p0 +%patch35 -p1 %patch37 -p1 -%patch39 -p0 +%patch39 -p1 %patch40 -p1 %patch41 -p1 %patch60 @@ -163,7 +162,7 @@ autoreconf -f -i %configure\ --libexecdir=%{_prefix}/lib/gdm \ --localstatedir=%{_localstatedir} \ - --with-at-spi-registryd-directory=%{_libexecdir}/at-spi \ + --with-at-spi-registryd-directory=%{_libexecdir}/at-spi2 \ --with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon \ --with-consolekit-directory=%{_libexecdir}/ConsoleKit \ --with-polkit-gnome-directory=%{_libexecdir}/polkit-gnome \ From 4e48dd0f1f37cd81f059c7a172676fead6b795d1d78b489c3d57bcff381bfe77 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 13 May 2010 22:43:13 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/gdm revision 93.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=93d0dee44463d064f44e68be15cd8dcc --- gdm-2.30.0.tar.bz2 | 3 --- gdm-2.30.2.tar.bz2 | 3 +++ gdm-polkit-gnome-path.patch | 8 +++---- gdm-xauthlocalhostname.patch | 38 ++++++++++++++++---------------- gdm.changes | 42 ++++++++++++++++++++++++++++++++++++ gdm.spec | 15 +++++++------ 6 files changed, 76 insertions(+), 33 deletions(-) delete mode 100644 gdm-2.30.0.tar.bz2 create mode 100644 gdm-2.30.2.tar.bz2 diff --git a/gdm-2.30.0.tar.bz2 b/gdm-2.30.0.tar.bz2 deleted file mode 100644 index 767f09d..0000000 --- a/gdm-2.30.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac2c367766b8fa20ebeb41033931fc4d91482ad3d377823f1c7ad84eee12dc15 -size 2291133 diff --git a/gdm-2.30.2.tar.bz2 b/gdm-2.30.2.tar.bz2 new file mode 100644 index 0000000..5d2cd67 --- /dev/null +++ b/gdm-2.30.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:884f4816a78f8f1eece8f1468f19dc01c5350d4a3513d3c0e854f45f870c1ec5 +size 2381359 diff --git a/gdm-polkit-gnome-path.patch b/gdm-polkit-gnome-path.patch index 9d4f3d4..84c4963 100644 --- a/gdm-polkit-gnome-path.patch +++ b/gdm-polkit-gnome-path.patch @@ -1,11 +1,11 @@ -Index: gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in +Index: data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in =================================================================== ---- gdm-2.28.0.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in -+++ gdm-2.28.0/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in +--- data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.orig 2010-04-27 23:51:57.000000000 +1000 ++++ data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in 2010-05-07 08:08:26.000000000 +1000 @@ -1,5 +1,5 @@ [Desktop Entry] Type=Application _Name=PolicyKit Authentication Agent --Exec=/usr/lib/polkit-gnome-authentication-agent-1 +-Exec=/usr/libexec/polkit-gnome-authentication-agent-1 +Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 OnlyShowIn=GNOME; diff --git a/gdm-xauthlocalhostname.patch b/gdm-xauthlocalhostname.patch index ec928bf..42635a1 100644 --- a/gdm-xauthlocalhostname.patch +++ b/gdm-xauthlocalhostname.patch @@ -1,7 +1,7 @@ -Index: gdm-2.27.90/daemon/gdm-display-access-file.c +Index: daemon/gdm-display-access-file.c =================================================================== ---- gdm-2.27.90.orig/daemon/gdm-display-access-file.c -+++ gdm-2.27.90/daemon/gdm-display-access-file.c +--- daemon/gdm-display-access-file.c.orig 2010-03-18 08:27:16.000000000 +1100 ++++ daemon/gdm-display-access-file.c 2010-05-11 07:44:22.000000000 +1000 @@ -440,11 +440,15 @@ _get_auth_info_for_display (GdmDisplayAc if (is_local) { char localhost[HOST_NAME_MAX + 1] = ""; @@ -18,13 +18,13 @@ Index: gdm-2.27.90/daemon/gdm-display-access-file.c } else { *family = FamilyWild; gdm_display_get_remote_hostname (display, address, NULL); -Index: gdm-2.27.90/daemon/gdm-session-direct.c +Index: daemon/gdm-session-direct.c =================================================================== ---- gdm-2.27.90.orig/daemon/gdm-session-direct.c -+++ gdm-2.27.90/daemon/gdm-session-direct.c -@@ -2050,6 +2050,12 @@ setup_session_environment (GdmSessionDir - session->priv->user_x11_authority_file); - } +--- daemon/gdm-session-direct.c.orig 2010-05-11 07:44:20.000000000 +1000 ++++ daemon/gdm-session-direct.c 2010-05-11 07:44:22.000000000 +1000 +@@ -2075,6 +2075,12 @@ setup_session_environment (GdmSessionDir + g_getenv ("WINDOWPATH")); + + if (session->priv->display_is_local) { + gdm_session_direct_set_environment_variable (session, @@ -35,11 +35,11 @@ Index: gdm-2.27.90/daemon/gdm-session-direct.c /* FIXME: We do this here and in the session worker. We should consolidate * somehow. */ -Index: gdm-2.27.90/daemon/gdm-slave.c +Index: daemon/gdm-slave.c =================================================================== ---- gdm-2.27.90.orig/daemon/gdm-slave.c -+++ gdm-2.27.90/daemon/gdm-slave.c -@@ -222,6 +222,10 @@ get_script_environment (GdmSlave *slav +--- daemon/gdm-slave.c.orig 2010-04-27 23:48:54.000000000 +1000 ++++ daemon/gdm-slave.c 2010-05-11 07:44:22.000000000 +1000 +@@ -233,6 +233,10 @@ get_script_environment (GdmSlave *slav g_hash_table_insert (hash, g_strdup ("REMOTE_HOST"), g_strdup (slave->priv->display_hostname)); } @@ -50,7 +50,7 @@ Index: gdm-2.27.90/daemon/gdm-slave.c /* Runs as root */ g_hash_table_insert (hash, g_strdup ("XAUTHORITY"), g_strdup (slave->priv->display_x11_authority_file)); g_hash_table_insert (hash, g_strdup ("DISPLAY"), g_strdup (slave->priv->display_name)); -@@ -374,6 +378,7 @@ gdm_slave_connect_to_x11_display (GdmSla +@@ -481,6 +485,7 @@ gdm_slave_connect_to_x11_display (GdmSla g_setenv ("DISPLAY", slave->priv->display_name, TRUE); g_setenv ("XAUTHORITY", slave->priv->display_x11_authority_file, TRUE); @@ -58,11 +58,11 @@ Index: gdm-2.27.90/daemon/gdm-slave.c sigemptyset (&mask); sigaddset (&mask, SIGCHLD); -Index: gdm-2.27.90/daemon/gdm-welcome-session.c +Index: daemon/gdm-welcome-session.c =================================================================== ---- gdm-2.27.90.orig/daemon/gdm-welcome-session.c -+++ gdm-2.27.90/daemon/gdm-welcome-session.c -@@ -315,6 +315,10 @@ get_welcome_environment (GdmWelcomeSessi +--- daemon/gdm-welcome-session.c.orig 2010-04-27 03:08:42.000000000 +1000 ++++ daemon/gdm-welcome-session.c 2010-05-11 07:44:22.000000000 +1000 +@@ -420,6 +420,10 @@ get_welcome_environment (GdmWelcomeSessi g_hash_table_insert (hash, g_strdup ("SHELL"), g_strdup (pwent->pw_shell)); } @@ -72,4 +72,4 @@ Index: gdm-2.27.90/daemon/gdm-welcome-session.c + } g_hash_table_insert (hash, g_strdup ("PATH"), g_strdup (g_getenv ("PATH"))); - + g_hash_table_insert (hash, g_strdup ("WINDOWPATH"), g_strdup (g_getenv ("WINDOWPATH"))); diff --git a/gdm.changes b/gdm.changes index f2586b4..7a0422f 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Fri May 7 00:03:41 CEST 2010 - captain.magnus@opensuse.org + +- Update to version 2.30.2: + + Accessibility is now enabled by default for the GDM login + screen + + When the face browser is disabled, the PAM conversation is + started immediately, so users do not need to click a button to + start entering the username and password. bgo#591082 + + Add label-for and labelled-by a11y relations to the entry field + in the login GUI. This makes the login GUI more accessible when + using AT programs. bgo#613434 + + Fixed bugs that were causing XDMCP to not show the greeter + again after logout. bgo#606724 + + The default XDMCP PingIntervalSeconds was increased from 15 to + 60 seconds + + The WINDOWPATH environment variable is now set for the user + session. bgo#609272 + + Ensure Init script is called when using Automatic Login. + bgo#614488 + + Fix race condition with Timed Login. bgo#614062 + + Drop xhost localuser:gdm and localuser:root when the user + session starts. bgo#605350 + + Removed the icon monitor from the GDM login GUI since it was + not functional and was causing problems with automounting + user's HOME directories. #609321 + + Do not mark "%x" for translation. bgo#613306 + + Remove duplicated strings for translation. bgo#609179 + + Minor doc corrections + + Translation updates +- gdm-greeter-greater-ui.patch does not apply and is commented out + temporarily +- Respin gdm-xauthlocalhostname.patch for fuzz=0 +- Respin gdm-polkit-gnome-path.patch + +------------------------------------------------------------------- +Thu Apr 8 02:02:20 CEST 2010 - vuntz@opensuse.org + +- Use the path for the at-spi-registryd from the old at-spi stack: + the at-spi2 developers think it's safer to ship 11.3 with the old + stack by default. + ------------------------------------------------------------------- Tue Mar 30 01:43:33 CEST 2010 - vuntz@opensuse.org diff --git a/gdm.spec b/gdm.spec index ddeeb22..75394a3 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,5 +1,5 @@ # -# spec file for package gdm (Version 2.30.0) +# spec file for package gdm (Version 2.30.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -41,7 +41,7 @@ BuildRequires: xorg-x11-server-extra BuildRequires: zenity License: GPLv2+ Group: System/GUI/GNOME -Version: 2.30.0 +Version: 2.30.2 Release: 1 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 @@ -63,7 +63,7 @@ Patch7: gdm-suse-xsession.patch Patch8: gdm-sysconfig-settings.patch # PATCH-FEATURE-SLED gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain Patch9: gdm-domain-logon.patch -# PATCH-FIX-UPSTREAM gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) +# PATCH-NEEDS-REBASE (was PATCH-FIX-UPSTREAM) gdm-greeter-greater-ui.patch bnc436431 bgo560508 vuntz@novell.com -- Improve the layout of the greeter. Note: the patch contains a patched glade file *and* the result glade file (for reference only, in case we need to rebase the patch) Patch15: gdm-greeter-greater-ui.patch # PATCH-FIX-UPSTREAM gdm-always-reflect-keyboard-layout.patch bnc438159 bgo561771 hpj@novell.com -- Make keyboard selector not neglect to apply the selected keyboard in some situations. Patch18: gdm-always-reflect-keyboard-layout.patch @@ -142,15 +142,16 @@ gnome-patch-translation-prepare %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch15 -p1 +#FIXME - Needs rebase +#%patch15 -p1 %patch18 -p1 %patch19 -p1 %patch20 -p1 %patch31 -p1 %patch34 -p1 -%patch35 -p1 +%patch35 -p0 %patch37 -p1 -%patch39 -p1 +%patch39 -p0 %patch40 -p1 %patch41 -p1 %patch60 @@ -162,7 +163,7 @@ autoreconf -f -i %configure\ --libexecdir=%{_prefix}/lib/gdm \ --localstatedir=%{_localstatedir} \ - --with-at-spi-registryd-directory=%{_libexecdir}/at-spi2 \ + --with-at-spi-registryd-directory=%{_libexecdir}/at-spi \ --with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon \ --with-consolekit-directory=%{_libexecdir}/ConsoleKit \ --with-polkit-gnome-directory=%{_libexecdir}/polkit-gnome \