From 1fed88523c08990fb5cc2817a4ec2db439d5f8f3da27e4074273260ec90871b2 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 23 Sep 2010 22:26:44 +0000 Subject: [PATCH] Accepting request 48988 from GNOME:Factory checked in (request 48988) OBS-URL: https://build.opensuse.org/request/show/48988 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=142 --- gdm-2.21.9-no-fatal-warnings.patch | 17 +++++++++++++++ gdm-2.31.90.tar.bz2 | 3 +++ gdm-2.31.92.tar.bz2 | 3 --- gdm-is-not-unstable-unless.patch | 14 ------------ gdm.changes | 35 ------------------------------ gdm.spec | 14 ++++++------ 6 files changed, 27 insertions(+), 59 deletions(-) create mode 100644 gdm-2.21.9-no-fatal-warnings.patch create mode 100644 gdm-2.31.90.tar.bz2 delete mode 100644 gdm-2.31.92.tar.bz2 delete mode 100644 gdm-is-not-unstable-unless.patch diff --git a/gdm-2.21.9-no-fatal-warnings.patch b/gdm-2.21.9-no-fatal-warnings.patch new file mode 100644 index 0000000..a6f282d --- /dev/null +++ b/gdm-2.21.9-no-fatal-warnings.patch @@ -0,0 +1,17 @@ +Index: gdm-2.31.90/common/gdm-common.c +=================================================================== +--- gdm-2.31.90.orig/common/gdm-common.c ++++ gdm-2.31.90/common/gdm-common.c +@@ -68,10 +68,12 @@ gdm_is_version_unstable (void) + void + gdm_set_fatal_warnings_if_unstable (void) + { ++#if 0 + if (gdm_is_version_unstable ()) { + g_setenv ("G_DEBUG", "fatal_criticals", FALSE); + g_log_set_always_fatal (G_LOG_LEVEL_CRITICAL); + } ++#endif + } + + gboolean diff --git a/gdm-2.31.90.tar.bz2 b/gdm-2.31.90.tar.bz2 new file mode 100644 index 0000000..b1608ec --- /dev/null +++ b/gdm-2.31.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90bbef4b6361ac41de18544e4eb4547087b72e9817cb3804457db4fc65d71b58 +size 2473664 diff --git a/gdm-2.31.92.tar.bz2 b/gdm-2.31.92.tar.bz2 deleted file mode 100644 index 83ec895..0000000 --- a/gdm-2.31.92.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:429c4d8ef0ae1a30be8f250dca36c69cf948d20f57b0114676e41adb2528d995 -size 2476222 diff --git a/gdm-is-not-unstable-unless.patch b/gdm-is-not-unstable-unless.patch deleted file mode 100644 index c5307c6..0000000 --- a/gdm-is-not-unstable-unless.patch +++ /dev/null @@ -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); diff --git a/gdm.changes b/gdm.changes index bf6617f..0d80912 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,38 +1,3 @@ -------------------------------------------------------------------- -Wed Sep 22 14:26:23 CEST 2010 - vuntz@opensuse.org - -- Rename gdm-2.21.9-no-fatal-warnings.patch to - gdm-is-not-unstable-unless.patch, and change the behavior: - if the SUSE_ENABLE_UNSTABLE_CHECK environment variable is set, we - just do like upstream. If it is not set, we make GDM assume it's - not running a development version, which disables fatal warnings - and verbose logs. - -------------------------------------------------------------------- -Thu Sep 16 09:55:10 CEST 2010 - vuntz@opensuse.org - -- Update to version 2.31.92: - + Change orca invocation to work better with latest release - + Fix "Other..." item in network-login-only scenarios - + Move gdm.schemas to pkgdatadir - + XDMCP fixes - + Improve ordering of languages in languages list - + Make various slow calls that blocked before asynchronous - + Fix up dbus security policy - + Various other fixes - + Translation updates -- Drop gdm-fix-dbus-properties.patch: fixed upstream. - -------------------------------------------------------------------- -Mon Sep 13 13:30:47 CEST 2010 - vuntz@opensuse.org - -- Add gdm-fix-dbus-properties.patch: org.gnome.DBus.Properties was - referenced instead of org.freedesktop.DBus.Properties in the dbus - configuration. Fix bnc#633655. -- Move fast-user-switch-applet Obsoletes to gnome-applets-gdm and - add a Provides there too: the applet is really the old - fast-user-switch-applet applet. - ------------------------------------------------------------------- Wed Aug 18 10:13:35 CEST 2010 - dimstar@opensuse.org diff --git a/gdm.spec b/gdm.spec index 33873e0..35a6c0f 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,5 +1,5 @@ # -# spec file for package gdm (Version 2.31.92) +# spec file for package gdm (Version 2.31.90) # # 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.31.92 +Version: 2.31.90 Release: 1 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 @@ -51,8 +51,8 @@ Source2: gdm-autologin.pamd Source3: SuSEconfig.gdm # PATCH-FIX-UPSTREAM gdm-helper-directory.patch bgo582320 vuntz@novell.com -- Add --with-gnome-settings-daemon-directory, --with-consolekit-directory, --with-at-spi-registryd-directory Patch1: 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 -Patch2: gdm-is-not-unstable-unless.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 # 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 @@ -86,6 +86,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build DocDir: %{_defaultdocdir} Provides: gdm2 = %{version} Obsoletes: gdm2 < %{version} +Obsoletes: fast-user-switch-applet <= 2.22.0 Requires: %{name}-branding Requires: %{name}-lang = %{version} Requires: ConsoleKit-x11 @@ -128,8 +129,6 @@ License: GPLv2+ Summary: Switch User Panel Applet Group: System/GUI/GNOME Supplements: packageand(%{name}:gnome-panel) -Provides: fast-user-switch-applet = 2.22.0 -Obsoletes: fast-user-switch-applet <= 2.22.0 %description -n gnome-applets-gdm This package provides the switch user panel applet, that uses GDM, @@ -234,7 +233,7 @@ fi %config %{_sysconfdir}/gdm/[IPXl]* %{_sbindir}/gdm %{_bindir}/* -%{_datadir}/gdm/ +%{_datadir}/gdm %{_datadir}/pixmaps/*.png %{_datadir}/pixmaps/faces %{_datadir}/icons/*/*/*/*.* @@ -251,6 +250,7 @@ fi %config /etc/pam.d/* /sbin/conf.d/SuSEconfig.gdm %config %{_sysconfdir}/dbus-1/system.d/gdm.conf +%config %{_sysconfdir}/gdm/gdm.schemas %files branding-upstream %defattr(-,root,root)