From 868d4940a103371e4c976f03b26677a2d5b0343d3d20469d1e5aa7e87d145c3b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 14 Sep 2010 12:25:18 +0000 Subject: [PATCH] Accepting request 48001 from home:vuntz:branches:GNOME:Factory Thanks OBS-URL: https://build.opensuse.org/request/show/48001 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=139 --- gdm-fix-dbus-properties.patch | 43 +++++++++++++++++++++++++++++++++++ gdm.changes | 10 ++++++++ gdm.spec | 6 ++++- 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 gdm-fix-dbus-properties.patch diff --git a/gdm-fix-dbus-properties.patch b/gdm-fix-dbus-properties.patch new file mode 100644 index 0000000..bc32e00 --- /dev/null +++ b/gdm-fix-dbus-properties.patch @@ -0,0 +1,43 @@ +From 621d4959ba483cc7f7fe88fa8ddd90bb9fdc4d26 Mon Sep 17 00:00:00 2001 +From: Vincent Untz +Date: Mon, 13 Sep 2010 13:22:49 +0200 +Subject: [PATCH] Fix gdm.conf to use org.freedesktop.DBus.Properties + +We were using org.gnome.DBus.Properties... +--- + data/gdm.conf.in | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/data/gdm.conf.in b/data/gdm.conf.in +index 0a13060..23e5fcc 100644 +--- a/data/gdm.conf.in ++++ b/data/gdm.conf.in +@@ -20,7 +20,7 @@ + + ++ send_interface="org.freedesktop.DBus.Properties" /> + + +@@ -40,7 +40,7 @@ + + ++ send_interface="org.freedesktop.DBus.Properties" /> + + +@@ -83,7 +83,7 @@ + + ++ send_interface="org.freedesktop.DBus.Properties" /> + + +-- +1.7.1 diff --git a/gdm.changes b/gdm.changes index 0d80912..49c3517 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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 35a6c0f..f1c9f43 100644 --- a/gdm.spec +++ b/gdm.spec @@ -79,6 +79,8 @@ Patch35: gdm-xauthlocalhostname.patch Patch37: gdm-autologin-once.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 Patch40: gdm-look-at-runlevel.patch +# PATCH-FIX-UPSTREAM gdm-fix-dbus-properties.patch bnc#633655 bgo#629504 vuntz@opensuse.org -- Fix dbus configuration file to reference org.freedesktop.DBus.Properties instead of non-existing org.gnome.DBus.Properties +Patch41: gdm-fix-dbus-properties.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/ @@ -86,7 +88,6 @@ 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 @@ -129,6 +130,8 @@ 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, @@ -154,6 +157,7 @@ translation-update-upstream %patch35 -p0 %patch37 -p1 %patch40 -p1 +%patch41 -p1 %patch60 #gnome-patch-translation-update