SHA256
1
0
forked from pool/gdm

Accepting request 228609 from GNOME:Next

Push GNOME:Next - GNOME 3.12.0

OBS-URL: https://build.opensuse.org/request/show/228609
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=260
This commit is contained in:
Dominique Leuenberger 2014-04-03 20:37:03 +00:00 committed by Git OBS Bridge
parent a02c60d787
commit 801803f8a7
10 changed files with 148 additions and 6347 deletions

View File

@ -19,10 +19,11 @@ if test -z $INTLTOOLIZE; then
exit 1 exit 1
fi fi
autopoint --force set -e
AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
intltoolize --force --copy --automake
autoreconf --force --install --verbose
cd $olddir cd $olddir
test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:549a42009af9c79a4e07632e405dcb71ba2e876e766cff02471511ad641b6ae7
size 1552460

3
gdm-3.12.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:74889819a0c55577fd04236b5308de5f1fcf1992b221c71d02d91a1e564a5d87
size 1522032

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +1,8 @@
Index: gdm-3.9.5/daemon/gdm-session-worker.c Index: gdm-3.11.92.1/daemon/gdm-session-worker.c
=================================================================== ===================================================================
--- gdm-3.9.5.orig/daemon/gdm-session-worker.c --- gdm-3.11.92.1.orig/daemon/gdm-session-worker.c
+++ gdm-3.9.5/daemon/gdm-session-worker.c +++ gdm-3.11.92.1/daemon/gdm-session-worker.c
@@ -171,6 +171,8 @@ struct GdmSessionWorkerPrivate @@ -179,6 +179,8 @@ struct GdmSessionWorkerPrivate
GdmSessionSettings *user_settings; GdmSessionSettings *user_settings;
GDBusMethodInvocation *pending_invocation; GDBusMethodInvocation *pending_invocation;
@ -11,9 +11,9 @@ Index: gdm-3.9.5/daemon/gdm-session-worker.c
}; };
enum { enum {
@@ -1157,6 +1159,9 @@ gdm_session_worker_initialize_pam (GdmSe @@ -1144,6 +1146,9 @@ gdm_session_worker_initialize_pam (GdmSe
g_free (pam_xauth); gdm_session_worker_set_environment_variable (worker, "XDG_SESSION_CLASS", "greeter");
#endif }
+ if (worker->priv->suse_session_name) + if (worker->priv->suse_session_name)
+ gdm_session_worker_set_environment_variable (worker, "DESKTOP_SESSION", worker->priv->suse_session_name); + gdm_session_worker_set_environment_variable (worker, "DESKTOP_SESSION", worker->priv->suse_session_name);
@ -21,7 +21,7 @@ Index: gdm-3.9.5/daemon/gdm-session-worker.c
g_debug ("GdmSessionWorker: state SETUP_COMPLETE"); g_debug ("GdmSessionWorker: state SETUP_COMPLETE");
worker->priv->state = GDM_SESSION_WORKER_STATE_SETUP_COMPLETE; worker->priv->state = GDM_SESSION_WORKER_STATE_SETUP_COMPLETE;
@@ -2102,6 +2107,12 @@ gdm_session_worker_handle_set_session_na @@ -2286,6 +2291,12 @@ gdm_session_worker_handle_set_session_na
{ {
GdmSessionWorker *worker = GDM_SESSION_WORKER (object); GdmSessionWorker *worker = GDM_SESSION_WORKER (object);
g_debug ("GdmSessionWorker: session name set to %s", session_name); g_debug ("GdmSessionWorker: session name set to %s", session_name);
@ -34,7 +34,7 @@ Index: gdm-3.9.5/daemon/gdm-session-worker.c
gdm_session_settings_set_session_name (worker->priv->user_settings, gdm_session_settings_set_session_name (worker->priv->user_settings,
session_name); session_name);
gdm_dbus_worker_complete_set_session_name (object, invocation); gdm_dbus_worker_complete_set_session_name (object, invocation);
@@ -2109,6 +2120,24 @@ gdm_session_worker_handle_set_session_na @@ -2293,6 +2304,24 @@ gdm_session_worker_handle_set_session_na
} }
static gboolean static gboolean
@ -59,15 +59,15 @@ Index: gdm-3.9.5/daemon/gdm-session-worker.c
gdm_session_worker_handle_set_session_type (GdmDBusWorker *object, gdm_session_worker_handle_set_session_type (GdmDBusWorker *object,
GDBusMethodInvocation *invocation, GDBusMethodInvocation *invocation,
const char *session_type) const char *session_type)
@@ -2903,6 +2932,7 @@ worker_interface_init (GdmDBusWorkerIfac @@ -3098,6 +3127,7 @@ worker_interface_init (GdmDBusWorkerIfac
interface->handle_open = gdm_session_worker_handle_open; interface->handle_open = gdm_session_worker_handle_open;
interface->handle_set_language_name = gdm_session_worker_handle_set_language_name; interface->handle_set_language_name = gdm_session_worker_handle_set_language_name;
interface->handle_set_session_name = gdm_session_worker_handle_set_session_name; interface->handle_set_session_name = gdm_session_worker_handle_set_session_name;
+ interface->handle_set_default_session_name = gdm_session_worker_handle_set_default_session_name; + interface->handle_set_default_session_name = gdm_session_worker_handle_set_default_session_name;
interface->handle_set_session_type = gdm_session_worker_handle_set_session_type; interface->handle_set_session_type = gdm_session_worker_handle_set_session_type;
interface->handle_set_session_display_mode = gdm_session_worker_handle_set_session_display_mode;
interface->handle_set_environment_variable = gdm_session_worker_handle_set_environment_variable; interface->handle_set_environment_variable = gdm_session_worker_handle_set_environment_variable;
interface->handle_start_program = gdm_session_worker_handle_start_program; @@ -3211,6 +3241,8 @@ gdm_session_worker_finalize (GObject *ob
@@ -3015,6 +3045,8 @@ gdm_session_worker_finalize (GObject *ob
g_hash_table_unref (worker->priv->reauthentication_requests); g_hash_table_unref (worker->priv->reauthentication_requests);
@ -76,10 +76,10 @@ Index: gdm-3.9.5/daemon/gdm-session-worker.c
G_OBJECT_CLASS (gdm_session_worker_parent_class)->finalize (object); G_OBJECT_CLASS (gdm_session_worker_parent_class)->finalize (object);
} }
Index: gdm-3.9.5/daemon/gdm-session-worker.xml Index: gdm-3.11.92.1/daemon/gdm-session-worker.xml
=================================================================== ===================================================================
--- gdm-3.9.5.orig/daemon/gdm-session-worker.xml --- gdm-3.11.92.1.orig/daemon/gdm-session-worker.xml
+++ gdm-3.9.5/daemon/gdm-session-worker.xml +++ gdm-3.11.92.1/daemon/gdm-session-worker.xml
@@ -13,6 +13,9 @@ @@ -13,6 +13,9 @@
<method name="SetSessionName"> <method name="SetSessionName">
<arg name="session_name" direction="in" type="s" /> <arg name="session_name" direction="in" type="s" />
@ -90,11 +90,11 @@ Index: gdm-3.9.5/daemon/gdm-session-worker.xml
<method name="SetSessionType"> <method name="SetSessionType">
<arg name="session_type" direction="in" type="s"/> <arg name="session_type" direction="in" type="s"/>
</method> </method>
Index: gdm-3.9.5/daemon/gdm-session.c Index: gdm-3.11.92.1/daemon/gdm-session.c
=================================================================== ===================================================================
--- gdm-3.9.5.orig/daemon/gdm-session.c --- gdm-3.11.92.1.orig/daemon/gdm-session.c
+++ gdm-3.9.5/daemon/gdm-session.c +++ gdm-3.11.92.1/daemon/gdm-session.c
@@ -165,6 +165,8 @@ G_DEFINE_TYPE (GdmSession, @@ -164,6 +164,8 @@ G_DEFINE_TYPE (GdmSession,
gdm_session, gdm_session,
G_TYPE_OBJECT); G_TYPE_OBJECT);
@ -103,7 +103,7 @@ Index: gdm-3.9.5/daemon/gdm-session.c
static GdmSessionConversation * static GdmSessionConversation *
find_conversation_by_name (GdmSession *self, find_conversation_by_name (GdmSession *self,
const char *service_name) const char *service_name)
@@ -601,6 +603,9 @@ get_default_session_name (GdmSession *se @@ -616,6 +618,9 @@ get_default_session_name (GdmSession *se
static void static void
gdm_session_defaults_changed (GdmSession *self) gdm_session_defaults_changed (GdmSession *self)
{ {
@ -113,7 +113,7 @@ Index: gdm-3.9.5/daemon/gdm-session.c
if (self->priv->greeter_interface != NULL) { if (self->priv->greeter_interface != NULL) {
gdm_dbus_greeter_emit_default_language_name_changed (self->priv->greeter_interface, gdm_dbus_greeter_emit_default_language_name_changed (self->priv->greeter_interface,
@@ -608,6 +613,19 @@ gdm_session_defaults_changed (GdmSession @@ -623,6 +628,19 @@ gdm_session_defaults_changed (GdmSession
gdm_dbus_greeter_emit_default_session_name_changed (self->priv->greeter_interface, gdm_dbus_greeter_emit_default_session_name_changed (self->priv->greeter_interface,
get_default_session_name (self)); get_default_session_name (self));
} }
@ -133,7 +133,7 @@ Index: gdm-3.9.5/daemon/gdm-session.c
} }
void void
@@ -916,6 +934,10 @@ worker_on_saved_session_name_read (GdmDB @@ -931,6 +949,10 @@ worker_on_saved_session_name_read (GdmDB
if (strcmp (session_name, if (strcmp (session_name,
get_default_session_name (self)) != 0) { get_default_session_name (self)) != 0) {
@ -144,7 +144,7 @@ Index: gdm-3.9.5/daemon/gdm-session.c
g_free (self->priv->saved_session); g_free (self->priv->saved_session);
self->priv->saved_session = g_strdup (session_name); self->priv->saved_session = g_strdup (session_name);
@@ -923,6 +945,19 @@ worker_on_saved_session_name_read (GdmDB @@ -938,6 +960,19 @@ worker_on_saved_session_name_read (GdmDB
gdm_dbus_greeter_emit_default_session_name_changed (self->priv->greeter_interface, gdm_dbus_greeter_emit_default_session_name_changed (self->priv->greeter_interface,
session_name); session_name);
} }

View File

@ -1,14 +0,0 @@
Index: gdm-2.31.92/common/gdm-common.c
===================================================================
--- gdm-2.31.92.orig/common/gdm-common.c
+++ gdm-2.31.92/common/gdm-common.c
@@ -50,6 +50,9 @@ gdm_is_version_unstable (void)
char **versions;
gboolean unstable;
+ if (!g_getenv ("SUSE_ENABLE_UNSTABLE_CHECK"))
+ return FALSE;
+
unstable = FALSE;
versions = g_strsplit (VERSION, ".", 3);

View File

@ -115,7 +115,7 @@ Index: gdm-3.6.1/daemon/gdm-session.c
#include "gdm-session-worker-glue.h" #include "gdm-session-worker-glue.h"
#include "gdm-common.h" #include "gdm-common.h"
+#include "gdm-settings-client.h" +#include "gdm-settings-direct.h"
+#include "gdm-settings-keys.h" +#include "gdm-settings-keys.h"
+ +
#define GDM_SESSION_DBUS_ERROR_CANCEL "org.gnome.DisplayManager.Session.Error.Cancel" #define GDM_SESSION_DBUS_ERROR_CANCEL "org.gnome.DisplayManager.Session.Error.Cancel"
@ -127,7 +127,7 @@ Index: gdm-3.6.1/daemon/gdm-session.c
GdmSessionConversation *conversation; GdmSessionConversation *conversation;
+ gboolean passwordless; + gboolean passwordless;
+ +
+ if (!gdm_settings_client_get_boolean (GDM_KEY_SUSE_PASSWORDLESS_LOGIN_ENABLE, + if (!gdm_settings_direct_get_boolean (GDM_KEY_SUSE_PASSWORDLESS_LOGIN_ENABLE,
+ &passwordless)) { + &passwordless)) {
+ passwordless = FALSE; + passwordless = FALSE;
+ } + }

View File

@ -1,8 +1,8 @@
Index: gdm-3.7.5/common/Makefile.am Index: gdm-3.11.90/common/Makefile.am
=================================================================== ===================================================================
--- gdm-3.7.5.orig/common/Makefile.am --- gdm-3.11.90.orig/common/Makefile.am
+++ gdm-3.7.5/common/Makefile.am +++ gdm-3.11.90/common/Makefile.am
@@ -61,6 +61,8 @@ libgdmcommon_la_SOURCES = \ @@ -49,11 +49,15 @@ libgdmcommon_la_SOURCES = \
gdm-settings-backend.h \ gdm-settings-backend.h \
gdm-settings-desktop-backend.c \ gdm-settings-desktop-backend.c \
gdm-settings-desktop-backend.h \ gdm-settings-desktop-backend.h \
@ -11,19 +11,17 @@ Index: gdm-3.7.5/common/Makefile.am
gdm-settings-keys.h \ gdm-settings-keys.h \
gdm-settings-utils.h \ gdm-settings-utils.h \
gdm-settings-utils.c \ gdm-settings-utils.c \
@@ -68,6 +70,8 @@ libgdmcommon_la_SOURCES = \ gdm-settings-direct.c \
gdm-settings-direct.h \ gdm-settings-direct.h \
gdm-settings-client.h \ + gdm-sysconfig.c \
gdm-settings-client.c \ + gdm-sysconfig.h \
+ gdm-sysconfig.c \
+ gdm-sysconfig.h \
gdm-log.h \ gdm-log.h \
gdm-log.c \ gdm-log.c \
$(MKDTEMP_FILES) \ $(MKDTEMP_FILES) \
Index: gdm-3.7.5/common/gdm-settings-system-backend.c Index: gdm-3.11.90/common/gdm-settings-system-backend.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gdm-3.7.5/common/gdm-settings-system-backend.c +++ gdm-3.11.90/common/gdm-settings-system-backend.c
@@ -0,0 +1,348 @@ @@ -0,0 +1,348 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ * + *
@ -373,10 +371,10 @@ Index: gdm-3.7.5/common/gdm-settings-system-backend.c
+ +
+ return GDM_SETTINGS_BACKEND (object); + return GDM_SETTINGS_BACKEND (object);
+} +}
Index: gdm-3.7.5/common/gdm-settings-system-backend.h Index: gdm-3.11.90/common/gdm-settings-system-backend.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gdm-3.7.5/common/gdm-settings-system-backend.h +++ gdm-3.11.90/common/gdm-settings-system-backend.h
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ * + *
@ -434,28 +432,26 @@ Index: gdm-3.7.5/common/gdm-settings-system-backend.h
+G_END_DECLS +G_END_DECLS
+ +
+#endif /* __GDM_SETTINGS_SYSTEM_BACKEND_H */ +#endif /* __GDM_SETTINGS_SYSTEM_BACKEND_H */
Index: gdm-3.7.5/common/gdm-settings.c Index: gdm-3.11.90/common/gdm-settings.c
=================================================================== ===================================================================
--- gdm-3.7.5.orig/common/gdm-settings.c --- gdm-3.11.90.orig/common/gdm-settings.c
+++ gdm-3.7.5/common/gdm-settings.c +++ gdm-3.11.90/common/gdm-settings.c
@@ -39,6 +39,7 @@ @@ -38,12 +38,13 @@
#include "gdm-settings-glue.h" #include "gdm-settings.h"
#include "gdm-settings-desktop-backend.h" #include "gdm-settings-desktop-backend.h"
+#include "gdm-settings-system-backend.h" +#include "gdm-settings-system-backend.h"
#define GDM_DBUS_PATH "/org/gnome/DisplayManager" #define GDM_SETTINGS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SETTINGS, GdmSettingsPrivate))
#define GDM_SETTINGS_DBUS_PATH GDM_DBUS_PATH "/Settings"
@@ -50,7 +51,7 @@ struct GdmSettingsPrivate struct GdmSettingsPrivate
{ {
GDBusConnection *connection;
GdmDBusSettings *skeleton;
- GdmSettingsBackend *backend; - GdmSettingsBackend *backend;
+ GList *backends; + GList *backends;
}; };
enum { enum {
@@ -91,15 +92,29 @@ gdm_settings_get_value (GdmSettings *set @@ -80,15 +81,29 @@ gdm_settings_get_value (GdmSettings *set
{ {
GError *local_error; GError *local_error;
gboolean res; gboolean res;
@ -489,7 +485,7 @@ Index: gdm-3.7.5/common/gdm-settings.c
if (! res) { if (! res) {
g_propagate_error (error, local_error); g_propagate_error (error, local_error);
} }
@@ -119,6 +134,7 @@ gdm_settings_set_value (GdmSettings *set @@ -104,6 +119,7 @@ gdm_settings_set_value (GdmSettings *set
{ {
GError *local_error; GError *local_error;
gboolean res; gboolean res;
@ -497,7 +493,7 @@ Index: gdm-3.7.5/common/gdm-settings.c
g_return_val_if_fail (GDM_IS_SETTINGS (settings), FALSE); g_return_val_if_fail (GDM_IS_SETTINGS (settings), FALSE);
g_return_val_if_fail (key != NULL, FALSE); g_return_val_if_fail (key != NULL, FALSE);
@@ -126,10 +142,23 @@ gdm_settings_set_value (GdmSettings *set @@ -111,10 +127,23 @@ gdm_settings_set_value (GdmSettings *set
g_debug ("Setting value %s", key); g_debug ("Setting value %s", key);
local_error = NULL; local_error = NULL;
@ -525,7 +521,7 @@ Index: gdm-3.7.5/common/gdm-settings.c
if (! res) { if (! res) {
g_propagate_error (error, local_error); g_propagate_error (error, local_error);
} }
@@ -265,13 +294,21 @@ backend_value_changed (GdmSettingsBacken @@ -162,13 +191,21 @@ backend_value_changed (GdmSettingsBacken
static void static void
gdm_settings_init (GdmSettings *settings) gdm_settings_init (GdmSettings *settings)
{ {
@ -552,7 +548,7 @@ Index: gdm-3.7.5/common/gdm-settings.c
} }
static void static void
@@ -286,9 +323,9 @@ gdm_settings_finalize (GObject *object) @@ -183,9 +220,9 @@ gdm_settings_finalize (GObject *object)
g_return_if_fail (settings->priv != NULL); g_return_if_fail (settings->priv != NULL);
@ -565,10 +561,10 @@ Index: gdm-3.7.5/common/gdm-settings.c
G_OBJECT_CLASS (gdm_settings_parent_class)->finalize (object); G_OBJECT_CLASS (gdm_settings_parent_class)->finalize (object);
} }
Index: gdm-3.7.5/common/gdm-sysconfig.c Index: gdm-3.11.90/common/gdm-sysconfig.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gdm-3.7.5/common/gdm-sysconfig.c +++ gdm-3.11.90/common/gdm-sysconfig.c
@@ -0,0 +1,484 @@ @@ -0,0 +1,484 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ * + *
@ -1054,10 +1050,10 @@ Index: gdm-3.7.5/common/gdm-sysconfig.c
+ g_strfreev (lines); + g_strfreev (lines);
+ return result; + return result;
+} +}
Index: gdm-3.7.5/common/gdm-sysconfig.h Index: gdm-3.11.90/common/gdm-sysconfig.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ gdm-3.7.5/common/gdm-sysconfig.h +++ gdm-3.11.90/common/gdm-sysconfig.h
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ * + *
@ -1102,10 +1098,10 @@ Index: gdm-3.7.5/common/gdm-sysconfig.h
+G_END_DECLS +G_END_DECLS
+ +
+#endif /* __GDM_SYSCONFIG_H */ +#endif /* __GDM_SYSCONFIG_H */
Index: gdm-3.7.5/data/gdm.conf-custom.in Index: gdm-3.11.90/data/gdm.conf-custom.in
=================================================================== ===================================================================
--- gdm-3.7.5.orig/data/gdm.conf-custom.in --- gdm-3.11.90.orig/data/gdm.conf-custom.in
+++ gdm-3.7.5/data/gdm.conf-custom.in +++ gdm-3.11.90/data/gdm.conf-custom.in
@@ -1,4 +1,7 @@ @@ -1,4 +1,7 @@
# GDM configuration storage # GDM configuration storage
+# +#

View File

@ -1,3 +1,77 @@
-------------------------------------------------------------------
Wed Mar 26 18:45:34 UTC 2014 - zaitor@opensuse.org
- Update to version 3.12.0:
+ Fix automatic login.
+ Fix timed login.
+ Updated translations.
-------------------------------------------------------------------
Thu Mar 20 08:28:44 UTC 2014 - dimstar@opensuse.org
- Update to version 3.11.92.1:
+ BSD build fixes.
- Changes from version 3.11.92:
+ BSD build fixes.
+ Experimental Wayland support.
+ Support gnome-shell unlocking from non GDM sessions.
+ Drop slave process.
+ Onscreen keyboard support at login screen.
+ Updated translations.
- Rebase gdm-desktop-session-env-pam.patch.
- Copy autogen.sh to PWD instead of launching it from the SOURCE
directory.
- Synchronize autogen.sh with gdm git tree.
-------------------------------------------------------------------
Fri Feb 21 19:45:07 UTC 2014 - dimstar@opensuse.org
- Update to version 3.11.90:
+ Code clean ups.
+ Leak fixes.
+ Log X server to systemd journal.
+ Log fixes on none systemd systems.
+ Fail better when invoked wrong.
+ Change how dconf settings are used.
+ FreeBSD build fixes.
+ Updated translations.
- Rebase gdm-desktop-session-env-pam.patch,
gdm-passwordless-login.patch and gdm-sysconfig-settings.patch.
- Disable gdm-xauthlocalhostname.patch: Needs rebasing.
-------------------------------------------------------------------
Wed Jan 15 11:57:48 UTC 2014 - dimstar@opensuse.org
- Update to version 3.11.4:
+ Treat '' returned from a PAM module as "no username set" in the
same way NULL is.
+ Fix to work with more open dbus policy.
+ Updated translations.
-------------------------------------------------------------------
Mon Dec 16 23:07:35 UTC 2013 - dimstar@opensuse.org
- Update to version 3.11.3:
+ Infinite loop fix.
+ Require debugging to be explicitly enabled in unstable
versions.
+ Pass LC_ vars from system to user session.
+ Fix PAM reauthentication.
+ Updated translations.
- Drop gdm-is-not-unstable-unless.patch: debugging is no longer
enabled by default on unstable releases.
-------------------------------------------------------------------
Thu Nov 28 20:50:00 UTC 2013 - dimstar@opensuse.org
- Update to version 3.11.2:
+ XDMCP fixes.
+ BSD portability fixes.
+ Assorted changes to build goop.
+ Updated translations.
- Pass --with-gnome-settings-daemon-directory to configure.
- Drop gdm-XDMCP-fixes.patch: fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 27 19:52:01 UTC 2013 - dimstar@opensuse.org Wed Nov 27 19:52:01 UTC 2013 - dimstar@opensuse.org

View File

@ -1,7 +1,7 @@
# #
# spec file for package gdm # spec file for package gdm
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -27,13 +27,13 @@
%define enable_split_authentication 0 %define enable_split_authentication 0
Name: gdm Name: gdm
Version: 3.10.0.1 Version: 3.12.0
Release: 0 Release: 0
Summary: The GNOME Display Manager Summary: The GNOME Display Manager
License: GPL-2.0+ License: GPL-2.0+
Group: System/GUI/GNOME Group: System/GUI/GNOME
Url: http://projects.gnome.org/gdm/ Url: http://projects.gnome.org/gdm/
Source: http://download.gnome.org/sources/gdm/3.10/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/gdm/3.12/%{name}-%{version}.tar.xz
Source1: gdm.pamd Source1: gdm.pamd
Source2: gdm-autologin.pamd Source2: gdm-autologin.pamd
Source3: gdm-launch-environment.pamd Source3: gdm-launch-environment.pamd
@ -45,8 +45,6 @@ Source4: gdmflexiserver-wrapper
Source5: X11-displaymanager-gdm Source5: X11-displaymanager-gdm
# GDM does not boostrap using gnome-autogen.sh, but has it's own bootstrap script # GDM does not boostrap using gnome-autogen.sh, but has it's own bootstrap script
Source8: autogen.sh Source8: autogen.sh
# 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-NEEDS-REBASE 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 # PATCH-NEEDS-REBASE 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 Patch6: gdm-desktop-session-env-pam.patch
# PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts # PATCH-FIX-OPENSUSE gdm-suse-xsession.patch vuntz@novell.com -- Use the /etc/X11/xdm/* scripts
@ -62,8 +60,6 @@ Patch34: gdm-default-wm.patch
Patch35: gdm-xauthlocalhostname.patch Patch35: gdm-xauthlocalhostname.patch
# PATCH-FIX-UPSTREAM gdm-look-at-runlevel.patch bnc540482 bgo599180 vuntz@opensuse.org -- Look at the current runlevel before managing the display again, so we don't do this when shutting down or rebooting # PATCH-FIX-UPSTREAM gdm-look-at-runlevel.patch bnc540482 bgo599180 vuntz@opensuse.org -- Look at the current runlevel before managing the display again, so we don't do this when shutting down or rebooting
Patch40: gdm-look-at-runlevel.patch Patch40: gdm-look-at-runlevel.patch
# PATCH-FIX-UPSTREAM gdm-XDMCP-fixes.patch bnc#851160 bgo#690926 dimstar@opensuse.org -- Backported fixes from git for XDMCP remote login
Patch41: gdm-XDMCP-fixes.patch
BuildRequires: check-devel BuildRequires: check-devel
# needed for directory ownership # needed for directory ownership
BuildRequires: dconf BuildRequires: dconf
@ -188,19 +184,18 @@ running display manager.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
cp %{S:8} .
translation-update-upstream translation-update-upstream
%patch3 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch34 -p1 %patch34 -p1
%patch35 -p1 #patch35 -p1
%patch40 -p1 %patch40 -p1
%patch41 -p1
%build %build
NOCONFIGURE=1 sh %{S:8} NOCONFIGURE=1 sh autogen.sh
%configure\ %configure\
--disable-static \ --disable-static \
--libexecdir=%{_prefix}/lib/gdm \ --libexecdir=%{_prefix}/lib/gdm \
@ -208,6 +203,7 @@ NOCONFIGURE=1 sh %{S:8}
--with-at-spi-registryd-directory=%{_libexecdir}/at-spi \ --with-at-spi-registryd-directory=%{_libexecdir}/at-spi \
--with-consolekit-directory=%{_libexecdir}/ConsoleKit \ --with-consolekit-directory=%{_libexecdir}/ConsoleKit \
--with-check-accelerated-directory=%{_libexecdir} \ --with-check-accelerated-directory=%{_libexecdir} \
--with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon-3.0 \
--enable-ipv6 \ --enable-ipv6 \
--with-plymouth \ --with-plymouth \
%if %{with_systemd} %if %{with_systemd}
@ -233,8 +229,6 @@ find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
%if %{with_systemd} %if %{with_systemd}
rm %{buildroot}%{systemdsystemunitdir}/gdm.service rm %{buildroot}%{systemdsystemunitdir}/gdm.service
%endif %endif
# dconf database, rebuilt in scriptlets; touch it for %%ghost
touch %{buildroot}%{_sysconfdir}/dconf/db/gdm
## Install PAM files. ## Install PAM files.
mkdir -p $RPM_BUILD_ROOT/etc/pam.d mkdir -p $RPM_BUILD_ROOT/etc/pam.d
# Generic pam config # Generic pam config
@ -326,6 +320,9 @@ dconf update
%{_sbindir}/gdm %{_sbindir}/gdm
%{_bindir}/gdm %{_bindir}/gdm
%{_bindir}/gdm-screenshot %{_bindir}/gdm-screenshot
%dir %{_datadir}/dconf
%dir %{_datadir}/dconf/profile
%{_datadir}/dconf/profile/gdm
%{_datadir}/gdm/ %{_datadir}/gdm/
%{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
%{_datadir}/gnome-session/sessions/gdm-shell.session %{_datadir}/gnome-session/sessions/gdm-shell.session
@ -345,12 +342,6 @@ dconf update
%config /etc/pam.d/gdm-smartcard %config /etc/pam.d/gdm-smartcard
%config /etc/pam.d/gdm-launch-environment %config /etc/pam.d/gdm-launch-environment
%config %{_sysconfdir}/dbus-1/system.d/gdm.conf %config %{_sysconfdir}/dbus-1/system.d/gdm.conf
%dir %config %{_sysconfdir}/dconf/db/gdm.d
%dir %config %{_sysconfdir}/dconf/db/gdm.d/locks
%{_sysconfdir}/dconf/db/gdm.d/00-upstream-settings
%{_sysconfdir}/dconf/db/gdm.d/locks/00-upstream-settings-locks
%ghost %{_sysconfdir}/dconf/db/gdm
%{_sysconfdir}/dconf/profile/gdm
# /etc/xinit.d/xdm integration # /etc/xinit.d/xdm integration
%dir %{_libexecdir}/X11/displaymanagers %dir %{_libexecdir}/X11/displaymanagers
%{_libexecdir}/X11/displaymanagers/gdm %{_libexecdir}/X11/displaymanagers/gdm