commit gdm for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package gdm for openSUSE:Factory
checked in at Wed May 20 22:18:56 CEST 2009.
--------
--- GNOME/gdm/gdm.changes 2009-04-20 13:50:05.000000000 +0200
+++ gdm/gdm.changes 2009-05-15 11:10:45.000000000 +0200
@@ -1,0 +2,26 @@
+Fri May 15 11:04:57 CEST 2009 - vuntz@novell.com
+
+- Add gdm-keyboard-from-hal.patch to read the default keyboard
+ layout from hal on 11.2, should fix bnc#478083 and bnc#492284.
+- Split the keyboard part of gdm-sysconfig-settings.patch in
+ gdm-keyboard-from-sysconfig.patch, and only applit on 11.1 and
+ earlier. Also update the patch to strip some console keymaps part
+ of the layout that won't work in X (eg, fr-latin1 -> fr).
+- Based on work from claes.backstrom@fsfe.org and hpj@novell.com.
+
+-------------------------------------------------------------------
+Tue May 12 14:46:04 CEST 2009 - vuntz@novell.com
+
+- Drop gdm-X_SERVER.patch: it's not needed anymore since
+ /usr/bin/Xorg is the only supported X now.
+- Add gdm-helper-directory.patch to replace
+ gdm-2.23.92-gsd-path.patch and
+ gdm-consolekit-helper-subdir.patch: this new patch should be
+ suitable for upstream inclusion. Pass
+ --with-gnome-settings-daemon-directory and
+ --with-consolekit-directory to configure.
+- Tag gdm-2.21.9-no-fatal-warnings.patch,
+ gdm-vt-allocation-hack.patch, gdm-domain-logon.patch,
+ gdm-selinux.patch.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gdm-2.23.92-gsd-path.patch
gdm-consolekit-helper-subdir.patch
gdm-X_SERVER.patch
New:
----
gdm-helper-directory.patch
gdm-keyboard-from-hal.patch
gdm-keyboard-from-sysconfig.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gdm.spec ++++++
--- /var/tmp/diff_new_pack.N29138/_old 2009-05-20 22:15:51.000000000 +0200
+++ /var/tmp/diff_new_pack.N29138/_new 2009-05-20 22:15:51.000000000 +0200
@@ -42,7 +42,7 @@
License: GPL v2 or later
Group: System/GUI/GNOME
Version: 2.26.1
-Release: 1
+Release: 2
Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
@@ -50,14 +50,17 @@
# FIXME: See FIXME in the script.
Source3: SuSEconfig.gdm
Source5: sysconfig.displaymanager-gdm
-Patch1: gdm-consolekit-helper-subdir.patch
+# PATCH-FIX-UPSTREAM gdm-helper-directory.patch bgo582320 vuntz@novell.com -- Add --with-gnome-settings-daemon-directory and --with-consolekit-directory
+Patch1: gdm-helper-directory.patch
+# PATCH-FIX-OPENSUSE gdm-2.21.9-no-fatal-warnings.patch -- Do not accept fatal warnings in development version: gdm is too critical
Patch2: gdm-2.21.9-no-fatal-warnings.patch
+# PATCH-FIX-UPSTREAM gdm-vt-allocation-hack.patch bgo511168 hpj@novell.com -- Needed for user switching
Patch4: gdm-vt-allocation-hack.patch
-Patch5: gdm-2.23.92-gsd-path.patch
# PATCH-FIX-OPENSUSE gdm-desktop-session-env-pam.patch bnc427744 vuntz@novell.com -- Sets a PAM environment variable to let the pam gnome-keyring module know which session is started
Patch6: gdm-desktop-session-env-pam.patch
# PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts
Patch7: gdm-suse-xsession.patch
+# PATCH-FEATURE-SLED gdm-domain-logon.patch hpj@novell.com -- Add UI to log in a specific domain
Patch8: gdm-domain-logon.patch
# PATCH-FIX-OPENSUSE gdm-sysconfig-settings.patch bnc432360 hpj@novell.com -- Read autologin options from /etc/sysconfig/displaymanager
Patch13: gdm-sysconfig-settings.patch
@@ -77,12 +80,15 @@
Patch24: gdm-session-worker-check-states.patch
# PATCH-FIX-UPSTREAM gdm-fix-locale-listing.patch bnc446446 vuntz@novell.com -- Fix locale listing so that all locales are listed in the language chooser
Patch26: gdm-fix-locale-listing.patch
-Patch28: gdm-X_SERVER.patch
# PATCH-FIX-UPSTREAM gdm-dbus-allow-introspection.patch bnc473880 bgo572214 vuntz@novell.com -- Patch by thoenig to allow introspection of the dbus service
Patch30: gdm-dbus-allow-introspection.patch
# PATCH-FIX-OPENSUSE gdm-gconf-path.patch vuntz@novell.com -- Fix gconf paths to be consistent with the ones used in openSUSE
Patch31: gdm-gconf-path.patch
-# PATCH-SUSE: enable SELinux
+# PATCH-FIX-OPENSUSE gdm-keyboard-from-hal.patch bnc492284 bnc478083 vuntz@novell.com -- Read the keyboard layout from hal
+Patch32: gdm-keyboard-from-hal.patch
+# PATCH-FIX-UPSTREAM gdm-keyboard-from-sysconfig.patch bnc432360 bnc478083 hpj@novell.com -- Read keyboard options from sysconfig (for openSUSE <= 11.1, since keyboard layout wasn't in hal)
+Patch33: gdm-keyboard-from-sysconfig.patch
+# PATCH-FIX-OPENSUSE gdm-selinux.patch -- Small changes to make it compile fine with SELinux
Patch60: gdm-selinux.patch
Url: http://www.gnome.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -151,7 +157,6 @@
%patch1 -p1
%patch2 -p1
%patch4 -p1
-%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
@@ -164,9 +169,13 @@
%patch23 -p1
%patch24 -p1
%patch26 -p1
-%patch28
%patch30 -p1
%patch31 -p1
+%if %suse_version > 1110
+%patch32 -p1
+%else
+%patch33 -p1
+%endif
%patch60
gnome-patch-translation-update
@@ -177,6 +186,8 @@
--libexecdir=%{_prefix}/lib/gdm \
--localstatedir=%{_localstatedir} \
--with-at-spi-registryd-directory=%{_prefix}/lib/at-spi \
+ --with-gnome-settings-daemon-directory=%{_prefix}/lib/gnome-settings-daemon \
+ --with-consolekit-directory=%{_prefix}/lib/ConsoleKit \
--with-selinux \
--enable-ipv6\
--disable-scrollkeeper
@@ -273,6 +284,26 @@
%files lang -f %{name}.lang
%changelog
+* Fri May 15 2009 vuntz@novell.com
+- Add gdm-keyboard-from-hal.patch to read the default keyboard
+ layout from hal on 11.2, should fix bnc#478083 and bnc#492284.
+- Split the keyboard part of gdm-sysconfig-settings.patch in
+ gdm-keyboard-from-sysconfig.patch, and only applit on 11.1 and
+ earlier. Also update the patch to strip some console keymaps part
+ of the layout that won't work in X (eg, fr-latin1 -> fr).
+- Based on work from claes.backstrom@fsfe.org and hpj@novell.com.
+* Tue May 12 2009 vuntz@novell.com
+- Drop gdm-X_SERVER.patch: it's not needed anymore since
+ /usr/bin/Xorg is the only supported X now.
+- Add gdm-helper-directory.patch to replace
+ gdm-2.23.92-gsd-path.patch and
+ gdm-consolekit-helper-subdir.patch: this new patch should be
+ suitable for upstream inclusion. Pass
+ --with-gnome-settings-daemon-directory and
+ --with-consolekit-directory to configure.
+- Tag gdm-2.21.9-no-fatal-warnings.patch,
+ gdm-vt-allocation-hack.patch, gdm-domain-logon.patch,
+ gdm-selinux.patch.
* Mon Apr 20 2009 vuntz@novell.com
- Update to version 2.26.1:
+ Use O_APPEND when opening log files
++++++ gdm-helper-directory.patch ++++++
diff --git a/configure.ac b/configure.ac
index 8cd83c6..915b532 100644
--- a/configure.ac
+++ b/configure.ac
@@ -982,6 +982,22 @@ fi
AC_SUBST(GDM_CUSTOM_CONF)
AC_SUBST(GDM_OLD_CONF, '${gdmconfdir}/gdm.conf')
+AC_ARG_WITH(gnome-settings-daemon-directory,
+ [AC_HELP_STRING([--with-gnome-settings-daemon-directory],
+ [Specify the directory of gnome-settings-daemon @<:@default=libexecdir@:>@])],,
+ [with_gnome_settings_daemon_directory="\${libexecdir}"])
+
+GNOME_SETTINGS_DAEMON_DIR=$with_gnome_settings_daemon_directory
+AC_SUBST(GNOME_SETTINGS_DAEMON_DIR)
+
+AC_ARG_WITH(consolekit-directory,
+ [AC_HELP_STRING([--with-consolekit-directory],
+ [Specify the directory of ck-get-x11-display-device @<:@default=libexecdir@:>@])],,
+ [with_consolekit_directory="\${libexecdir}"])
+
+CONSOLEKIT_DIR=$with_consolekit_directory
+AC_SUBST(CONSOLEKIT_DIR)
+
dnl ---------------------------------------------------------------------------
dnl - Check for XEvIE extension support
dnl ---------------------------------------------------------------------------
@@ -1386,6 +1402,8 @@ echo "
dmconfdir: ${dmconfdir}
localstatedir: ${localstatedir}
datadir: ${datadir}
+ g-s-d location: ${with_gnome_settings_daemon_directory}
+ consolekit location: ${with_consolekit_directory}
source code location: ${srcdir}
compiler: ${CC}
cflags: ${CFLAGS}
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 3daf924..10b0bd8 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -16,6 +16,7 @@ AM_CPPFLAGS = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\" \
-DGDM_SESSION_DEFAULT_PATH=\"$(GDM_SESSION_DEFAULT_PATH)\" \
+ -DCONSOLEKIT_DIR=\"$(CONSOLEKIT_DIR)\" \
$(DISABLE_DEPRECATED_CFLAGS) \
$(DAEMON_CFLAGS) \
$(XLIB_CFLAGS) \
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index ba10386..d3476e7 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -127,7 +127,7 @@ _gdm_server_query_ck_for_display_device (GdmServer *server)
g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
error = NULL;
- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s",
+ command = g_strdup_printf (CONSOLEKIT_DIR "/ck-get-x11-display-device --display %s",
server->priv->display_name);
g_debug ("GdmServer: Running helper %s", command);
diff --git a/data/greeter-autostart/Makefile.am b/data/greeter-autostart/Makefile.am
index 2f45a74..ea90455 100644
--- a/data/greeter-autostart/Makefile.am
+++ b/data/greeter-autostart/Makefile.am
@@ -5,7 +5,8 @@ edit = sed \
-e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \
-e 's|@LIBDIR[@]|$(libdir)|g' \
-e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \
- -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g'
+ -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' \
+ -e 's|@GNOME_SETTINGS_DAEMON_DIR[@]|$(GNOME_SETTINGS_DAEMON_DIR)|g'
%.desktop.in: %.desktop.in.in Makefile
$(edit) $< >$@
diff --git a/data/greeter-autostart/gnome-settings-daemon.desktop.in.in b/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
index b4b31e1..45131c9 100644
--- a/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
+++ b/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
@@ -1,8 +1,8 @@
[Desktop Entry]
Type=Application
_Name=GNOME Settings Daemon
-TryExec=@LIBEXECDIR@/gnome-settings-daemon
-Exec=@LIBEXECDIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
+TryExec=@GNOME_SETTINGS_DAEMON_DIR@/gnome-settings-daemon
+Exec=@GNOME_SETTINGS_DAEMON_DIR@/gnome-settings-daemon --gconf-prefix=/apps/gdm/simple-greeter/settings-manager-plugins
OnlyShowIn=GNOME;
X-GNOME-Autostart-Phase=Initialization
X-GNOME-Autostart-Notify=true
++++++ gdm-keyboard-from-hal.patch ++++++
diff -up gdm-2.25.2/configure.ac.system-keyboard gdm-2.25.2/configure.ac
--- gdm-2.25.2/configure.ac.system-keyboard 2009-02-24 22:51:00.058815966 -0500
+++ gdm-2.25.2/configure.ac 2009-02-24 22:51:00.154816109 -0500
@@ -69,6 +69,7 @@ AC_SUBST(COMMON_LIBS)
PKG_CHECK_MODULES(DAEMON,
dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ hal
)
AC_SUBST(DAEMON_CFLAGS)
AC_SUBST(DAEMON_LIBS)
diff -up gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard gdm-2.25.2/daemon/gdm-session-direct.c
--- gdm-2.25.2/daemon/gdm-session-direct.c.system-keyboard 2008-08-26 15:04:00.000000000 -0400
+++ gdm-2.25.2/daemon/gdm-session-direct.c 2009-02-24 22:55:02.656566009 -0500
@@ -45,6 +45,8 @@
#include
participants (1)
-
root@Hilbert.suse.de