Hello community,
here is the log from the commit of package gdm for openSUSE:Factory
checked in at Fri Jul 8 11:37:24 CEST 2011.
--------
--- GNOME/gdm/gdm.changes 2011-05-31 18:40:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/gdm/gdm.changes 2011-07-07 10:57:02.000000000 +0200
@@ -1,0 +2,56 @@
+Wed Jul 6 16:34:12 CEST 2011 - vuntz@opensuse.org
+
+- Change branding-upstream subpackage:
+ + Add Requires for gdm since the branding package is useless
+ without it.
+ + Update summary and description.
+ + Make noarch.
+- Change branding Requires in main subpackage to be "= %{version}"
+ since it has to be versioned.
+- Update branding documentation: there is only one file left in the
+ branding package.
+- Update Url tag.
+
+-------------------------------------------------------------------
+Sat Jul 2 09:53:09 CEST 2011 - vuntz@opensuse.org
+
+- Add explicit Requires for the components of the gnome-session
+ session defined and used by gdm:
+ + Add metacity, polkit-gnome Requires
+ + Change gnome-settings-daemon Recommends to Requires
+
+-------------------------------------------------------------------
+Wed Jun 15 10:16:44 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 3.1.2:
+ + GTK size negotiation fixes
+ + Do not propagate WINDOWPATH if its unset to begin with
+ + Audit fixes
+ + Break cycle between greeter and slave for session notification
+ + Screenshots in docs!
+ + Don't hardcode path to grep
+ + Fix introspection xml
+ + Allow .xsession-errors to be a symlink or FIFO
+ + PAM fixes
+ + Dconf fixes
+ + Land multi-stack
+ + Updated translations.
+- Add pkgconfig(nss) BuildRequires since nss is now required.
+- Drop gdm-selecting-desktop-environment.patch: fixed upstream,
+ another way.
+- Rebase the following patches in a trivial way:
+ + gdm-desktop-session-env-pam.patch
+ + gdm-plymouth.patch
+ + gdm-sysconfig-settings.patch
+ + gdm-xauthlocalhostname.patch
+- Rebase and optimize gdm-passwordless-login.patch thanks to code
+ changes.
+- Update descriptions of packages, based on text from README.
+- Add libgdmsimplegreeter1 and libgdmsimplegreeter-devel
+ subpackages for new library used to write greeter plugins.
+- Pass --disable-static to configure and remove .la files.
+- Create the directory where greeter plugins are put, if it doesn't
+ already exist, so we can package it.
+- Fix permissions of /var/lib/gdm/.local directory in file list.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gdm-3.0.4.tar.bz2
gdm-selecting-desktop-environment.patch
New:
----
gdm-3.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gdm.spec ++++++
--- /var/tmp/diff_new_pack.Dbll6n/_old 2011-07-08 11:35:52.000000000 +0200
+++ /var/tmp/diff_new_pack.Dbll6n/_new 2011-07-08 11:35:52.000000000 +0200
@@ -21,10 +21,10 @@
Name: gdm
License: GPLv2+
Group: System/GUI/GNOME
-Version: 3.0.4
+Version: 3.1.2
Release: 1
Summary: The GNOME Display Manager
-Url: http://www.gnome.org/
+Url: http://projects.gnome.org/gdm/
Source: %{name}-%{version}.tar.bz2
Source1: gdm.pamd
Source2: gdm-autologin.pamd
@@ -52,8 +52,6 @@
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
-# PATCH-FIX-UPSTREAM gdm-selecting-desktop-environment.patch bnc460591 mxwu@novell.com -- Selecting the right desktop environment
-Patch20: gdm-selecting-desktop-environment.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-FIX-OPENSUSE gdm-default-wm.patch vuntz@novell.com -- Use sysconfig to know to which desktop to use by default
@@ -88,17 +86,21 @@
BuildRequires: xorg-x11-server
BuildRequires: xorg-x11-server-extra
BuildRequires: pkgconfig(accountsservice)
-Requires: %{name}-branding
+BuildRequires: pkgconfig(nss)
+Requires: %{name}-branding = %{version}
Requires: ConsoleKit-x11
Requires: gnome-session-core
Requires: klogd
Requires: xorg-x11-server-extra
+# Packages for the gdm session (see /usr/share/gnome-session/sessions/gdm.session)
+Requires: gnome-settings-daemon
+Requires: metacity
+Requires: polkit-gnome
# For groupadd, useradd, usermod
PreReq: pwdutils
PreReq: %insserv_prereq
Recommends: %{name}-lang
Recommends: gnome-power-manager
-Recommends: gnome-settings-daemon
Recommends: iso-codes
Provides: gdm2 = %{version}
Obsoletes: gdm2 < %{version}
@@ -109,28 +111,47 @@
%gconf_schemas_prereq
%description
-This version of GDM, the GNOME display manager, is based on GTK2 and is
-suited for the GNOME Desktop. GDM is a flexible X Window System
-display manager that has many options, is usable for remote login, and
-provides a good looking graphical interface.
+The GNOME Display Manager is a system service that is responsible for
+providing graphical log-ins and managing local and remote displays.
+
+%package -n libgdmsimplegreeter1
+License: GPLv2+
+Summary: Library for GDM Simple Greeter Plugins
+Group: System/Libraries
+Recommends: gdm
+
+%description -n libgdmsimplegreeter1
+The GNOME Display Manager is a system service that is responsible for
+providing graphical log-ins and managing local and remote displays.
+
+%package -n libgdmsimplegreeter-devel
+License: GPLv2+
+Summary: Library for GDM Simple Greeter Plugins -- Development Files
+Group: Development/Libraries/GNOME
+Requires: libgdmsimplegreeter1 = %{version}
+
+%description -n libgdmsimplegreeter-devel
+The GNOME Display Manager is a system service that is responsible for
+providing graphical log-ins and managing local and remote displays.
%package branding-upstream
License: GPLv2+
-Summary: The GNOME Display Manager
+Summary: The GNOME Display Manager -- Upstream default configuration
Group: System/GUI/GNOME
+Requires: %{name} = %{version}
Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding)
Supplements: packageand(%{name}:branding-upstream)
-#BRAND: Provide two equal files - /usr/share/gdm/defaults.conf and
-#BRAND: factory-defaults.conf with default configuration of gdm.
-#BRAND: Branding package requires the package with the default theme.
-#NOTE: We may want to create gdm-themes with upstream themes.
+BuildArch: noarch
+#BRAND: Provide one file:
+#BRAND: /etc/gdm/custom.conf
+#BRAND: Default configuration of gdm
%description branding-upstream
-This version of GDM, the GNOME display manager, is based on GTK2 and is
-suited for the GNOME Desktop. GDM is a flexible X Window System
-display manager that has many options, is usable for remote login, and
-provides a good looking graphical interface.
+The GNOME Display Manager is a system service that is responsible for
+providing graphical log-ins and managing local and remote displays.
+
+This package provides the upstream default configuration for gdm.
%lang_package
%prep
@@ -151,7 +172,6 @@
# needs rebase (bnc#689552)
##%patch15 -p1
%patch18 -p1
-%patch20 -p1
%patch31 -p1
%patch34 -p1
%patch35 -p0
@@ -163,6 +183,7 @@
libtoolize -f -i
autoreconf -f -i
%configure\
+ --disable-static \
--libexecdir=%{_prefix}/lib/gdm \
--localstatedir=%{_localstatedir} \
--with-at-spi-registryd-directory=%{_libexecdir}/at-spi \
@@ -175,11 +196,15 @@
%__make %{?jobs:-j%jobs} V=1
%install
-%makeinstall
+%make_install
%if 0%{?suse_version} <= 1120
%{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
%endif
+find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
%find_gconf_schemas
+# Create extensions directory if it's not there yet, so we can package it
+test ! -d %{buildroot}%{_libdir}/gdm/simple-greeter/extensions
+mkdir -p %{buildroot}%{_libdir}/gdm/simple-greeter/extensions
# Remove wrapper, it is not needed.
mv $RPM_BUILD_ROOT%{_sbindir}/gdm-binary $RPM_BUILD_ROOT%{_sbindir}/gdm
# Install PAM files.
@@ -237,6 +262,10 @@
%insserv_cleanup
%icon_theme_cache_postun
+%post -n libgdmsimplegreeter1 -p /sbin/ldconfig
+
+%postun -n libgdmsimplegreeter1 -p /sbin/ldconfig
+
%files -f %{name}.schemas_list
%defattr(-,root,root)
%doc AUTHORS COPYING ChangeLog NEWS README
@@ -263,13 +292,34 @@
%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/%gconf-tree.xml
%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.gconf.path
-%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.local
+%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.local
+%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.local/share
+%attr(750,gdm,gdm) %dir %{_localstatedir}/lib/gdm/.local/share/applications
+%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.local/share/applications/mime-dummy-handler.desktop
+%attr(640,gdm,gdm) %{_localstatedir}/lib/gdm/.local/share/applications/mimeapps.list
%dir %{_localstatedir}/cache/gdm
%config /etc/pam.d/*
%config %{_sysconfdir}/dbus-1/system.d/gdm.conf
%{_sysconfdir}/dconf/db/gdm
%{_sysconfdir}/dconf/profile/gdm
+%files -n libgdmsimplegreeter1
+%defattr(-,root,root)
+%{_libdir}/libgdmsimplegreeter.so.*
+# Own directory where extensions are put
+%dir %{_datadir}/gdm
+%dir %{_datadir}/gdm/simple-greeter
+%dir %{_datadir}/gdm/simple-greeter/extensions
+%dir %{_libdir}/gdm
+%dir %{_libdir}/gdm/simple-greeter
+%dir %{_libdir}/gdm/simple-greeter/extensions
+
+%files -n libgdmsimplegreeter-devel
+%defattr(-,root,root)
+%{_includedir}/gdm/
+%{_libdir}/libgdmsimplegreeter.so
+%{_libdir}/pkgconfig/gdmsimplegreeter.pc
+
%files branding-upstream
%defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/gdm/custom.conf
++++++ gdm-3.0.4.tar.bz2 -> gdm-3.1.2.tar.bz2 ++++++
++++ 31475 lines of diff (skipped)
++++++ gdm-desktop-session-env-pam.patch ++++++
--- /var/tmp/diff_new_pack.Dbll6n/_old 2011-07-08 11:35:53.000000000 +0200
+++ /var/tmp/diff_new_pack.Dbll6n/_new 2011-07-08 11:35:53.000000000 +0200
@@ -80,8 +80,8 @@
+static const char *get_session_name (GdmSessionDirect *session);
+
static gboolean
- send_dbus_message (DBusConnection *connection,
- DBusMessage *message)
+ send_dbus_message (GdmSessionConversation *conversation,
+ DBusMessage *message)
@@ -707,10 +709,14 @@ get_default_session_name (GdmSessionDire
static void
gdm_session_direct_defaults_changed (GdmSessionDirect *session)
++++++ gdm-passwordless-login.patch ++++++
--- /var/tmp/diff_new_pack.Dbll6n/_old 2011-07-08 11:35:53.000000000 +0200
+++ /var/tmp/diff_new_pack.Dbll6n/_new 2011-07-08 11:35:53.000000000 +0200
@@ -1,7 +1,7 @@
-Index: gdm-2.91.93/common/gdm-settings-system-backend.c
+Index: gdm-3.1.2/common/gdm-settings-system-backend.c
===================================================================
---- gdm-2.91.93.orig/common/gdm-settings-system-backend.c
-+++ gdm-2.91.93/common/gdm-settings-system-backend.c
+--- gdm-3.1.2.orig/common/gdm-settings-system-backend.c
++++ gdm-3.1.2/common/gdm-settings-system-backend.c
@@ -44,11 +44,11 @@
#define SYSCONFIG_AUTOLOGIN_KEY "DISPLAYMANAGER_AUTOLOGIN"
#define SYSCONFIG_TCP_OPEN_KEY "DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN"
@@ -78,10 +78,10 @@
} else {
g_set_error (error, GDM_SETTINGS_BACKEND_ERROR, GDM_SETTINGS_BACKEND_ERROR_KEY_NOT_FOUND, "Key not found");
return FALSE;
-Index: gdm-2.91.93/common/gdm-settings-keys.h
+Index: gdm-3.1.2/common/gdm-settings-keys.h
===================================================================
---- gdm-2.91.93.orig/common/gdm-settings-keys.h
-+++ gdm-2.91.93/common/gdm-settings-keys.h
+--- gdm-3.1.2.orig/common/gdm-settings-keys.h
++++ gdm-3.1.2/common/gdm-settings-keys.h
@@ -32,6 +32,7 @@ G_BEGIN_DECLS
#define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
#define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
@@ -90,10 +90,10 @@
#define GDM_KEY_DEBUG "debug/Enable"
-Index: gdm-2.91.93/data/gdm.schemas.in.in
+Index: gdm-3.1.2/data/gdm.schemas.in.in
===================================================================
---- gdm-2.91.93.orig/data/gdm.schemas.in.in
-+++ gdm-2.91.93/data/gdm.schemas.in.in
+--- gdm-3.1.2.orig/data/gdm.schemas.in.in
++++ gdm-3.1.2/data/gdm.schemas.in.in
@@ -47,6 +47,12 @@
<signature>i</signature>
<default>30</default>
@@ -107,56 +107,40 @@
<schema>
<key>debug/Enable</key>
-Index: gdm-2.91.93/daemon/gdm-factory-slave.c
+Index: gdm-3.1.2/daemon/gdm-greeter-server.c
===================================================================
---- gdm-2.91.93.orig/daemon/gdm-factory-slave.c
-+++ gdm-2.91.93/daemon/gdm-factory-slave.c
-@@ -44,6 +44,9 @@
-
+--- gdm-3.1.2.orig/daemon/gdm-greeter-server.c
++++ gdm-3.1.2/daemon/gdm-greeter-server.c
+@@ -46,6 +46,9 @@
#include "gdm-common.h"
+ #include "gdm-greeter-server.h"
+#include "gdm-settings-client.h"
+#include "gdm-settings-keys.h"
+
- #include "gdm-factory-slave.h"
- #include "gdm-factory-slave-glue.h"
+ #define GDM_GREETER_SERVER_DBUS_PATH "/org/gnome/DisplayManager/GreeterServer"
+ #define GDM_GREETER_SERVER_DBUS_INTERFACE "org.gnome.DisplayManager.GreeterServer"
+
+@@ -478,6 +481,7 @@ handle_begin_verification_for_user (GdmG
+ DBusError error;
+ const char *text;
+ const char *service_name;
++ gboolean passwordless;
+
+ dbus_error_init (&error);
+ if (! dbus_message_get_args (message, &error,
+@@ -488,6 +492,14 @@ handle_begin_verification_for_user (GdmG
+ }
+ dbus_error_free (&error);
-@@ -406,9 +409,16 @@ on_greeter_begin_verification_for_user (
- const char *username,
- GdmFactorySlave *slave)
- {
-+ gboolean passwordless;
-+
+ if (!gdm_settings_client_get_boolean (GDM_KEY_SUSE_PASSWORDLESS_LOGIN_ENABLE,
+ &passwordless)) {
+ passwordless = FALSE;
+ }
+
- g_debug ("GdmFactorySlave: begin verification for user");
- gdm_session_setup_for_user (GDM_SESSION (slave->priv->session),
-- "gdm",
-+ passwordless ? "gdm-autologin" : "gdm",
- username);
- }
-
-Index: gdm-2.91.93/daemon/gdm-simple-slave.c
-===================================================================
---- gdm-2.91.93.orig/daemon/gdm-simple-slave.c
-+++ gdm-2.91.93/daemon/gdm-simple-slave.c
-@@ -952,9 +952,15 @@ static void
- on_greeter_begin_verification (GdmGreeterServer *greeter_server,
- GdmSimpleSlave *slave)
- {
-+ gboolean passwordless;
++ if (passwordless)
++ service_name = "gdm-autologin";
+
-+ if (!gdm_settings_client_get_boolean (GDM_KEY_SUSE_PASSWORDLESS_LOGIN_ENABLE,
-+ &passwordless)) {
-+ passwordless = FALSE;
-+ }
- g_debug ("GdmSimpleSlave: begin verification");
- gdm_session_setup (GDM_SESSION (slave->priv->session),
-- "gdm");
-+ passwordless ? "gdm-autologin" : "gdm");
- }
+ g_debug ("GreeterServer: BeginVerificationForUser for '%s'", text);
- static void
+ reply = dbus_message_new_method_return (message);
++++++ gdm-plymouth.patch ++++++
--- /var/tmp/diff_new_pack.Dbll6n/_old 2011-07-08 11:35:53.000000000 +0200
+++ /var/tmp/diff_new_pack.Dbll6n/_new 2011-07-08 11:35:53.000000000 +0200
@@ -473,7 +473,7 @@
--- gdm-2.91.94.orig/configure.ac
+++ gdm-2.91.94/configure.ac
@@ -1271,6 +1271,23 @@ AC_SUBST(GDM_SCREENSHOT_DIR)
-
+ AC_SUBST(GDM_SIMPLE_GREETER_EXTENSIONS_DATA_DIR)
dnl ---------------------------------------------------------------------------
+dnl - Directory to spool events from other processes
++++++ gdm-sysconfig-settings.patch ++++++
--- /var/tmp/diff_new_pack.Dbll6n/_old 2011-07-08 11:35:53.000000000 +0200
+++ /var/tmp/diff_new_pack.Dbll6n/_new 2011-07-08 11:35:53.000000000 +0200
@@ -24,7 +24,7 @@
===================================================================
--- /dev/null
+++ gdm-2.32.0/common/gdm-settings-system-backend.c
-@@ -0,0 +1,349 @@
+@@ -0,0 +1,348 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2008 Hans Petter Jansson