Accepting request 103832 from home:vuntz:branches:GNOME:Factory

Ouch, very bad bug with the dconf thing: this breaks gdm :/

OBS-URL: https://build.opensuse.org/request/show/103832
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=200

gdm-plymouth-X-nr.patch

@@ -1,13 +0,0 @@
-Index: gdm-2.32.0/daemon/gdm-server.c
-===================================================================
---- gdm-2.32.0.orig/daemon/gdm-server.c
-+++ gdm-2.32.0/daemon/gdm-server.c
-@@ -739,7 +739,7 @@ gdm_server_start_on_active_vt (GdmServer
-         char *vt;
- 
-         g_free (server->priv->command);
--        server->priv->command = g_strdup (X_SERVER " -background none -verbose");
-+        server->priv->command = g_strdup (X_SERVER " -nr -verbose");
-         vt = get_active_vt_as_string ();
-         res = gdm_server_spawn (server, vt);
-         g_free (vt);

gdm.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Feb 12 10:42:34 UTC 2012 - vuntz@opensuse.org
+
+- Fix /etc/dconf/profile/gdm to exist and have valid content: we
+  were using it as %ghost, while the %ghost file should have been
+  /etc/dconf/db/gdm.
+- Drop gdm-plymouth-X-nr.patch: the -nr option was Fedora specific
+  and "-background none" is the right thing to use now. See
+  http://pkgs.fedoraproject.org/gitweb/?p=gdm.git;a=commitdiff;h=30dd105c68d2774e7e8fee48b5c2e1d6da793abe
+
 -------------------------------------------------------------------
 Tue Jan 17 09:43:44 UTC 2012 - vuntz@opensuse.org
 

gdm.spec

@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 # FIXME: need to check what should be done to enable this (at least adapt the pam files). See bnc#699999
 %define enable_split_authentication 0
 
@@ -36,8 +35,6 @@ Source4:        gdmflexiserver-wrapper
 Source5:        X11-displaymanager-gdm
 # PATCH-FEATURE-UPSTREAM gdm-plymouth.patch vuntz@opensuse.org -- Get a nice transition from plymouth; taken from Fedora
 Patch0:         gdm-plymouth.patch
-# PATCH-FIX-UPSTREAM gdm-plymouth-X-nr.patch vuntz@opensuse.org -- Patch on top of the previous patch (we keep it separate so it's easy to sync with Fedora) to use -nr when starting X
-Patch1:         gdm-plymouth-X-nr.patch
 # PATCH-FIX-UPSTREAM gdm-helper-directory.patch bgo582320 vuntz@novell.com -- Add --with-consolekit-directory, --with-check-accelerated-directory
 Patch2:         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
@@ -227,7 +224,6 @@ translation-update-upstream
 #disabled, needed for patch10
 gnome-patch-translation-prepare
 %patch0 -p1
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -280,9 +276,8 @@ mkdir -p %{buildroot}%{_libdir}/gdm/simple-greeter/extensions
 %endif
 # Remove wrapper, it is not needed.
 mv $RPM_BUILD_ROOT%{_sbindir}/gdm-binary $RPM_BUILD_ROOT%{_sbindir}/gdm
-# Remove dconf database, rebuilt in scriptlets; touch it for %%ghost
+# dconf database, rebuilt in scriptlets; touch it for %%ghost
-rm %{buildroot}%{_sysconfdir}/dconf/profile/gdm
+touch %{buildroot}%{_sysconfdir}/dconf/db/gdm
-touch %{buildroot}%{_sysconfdir}/dconf/profile/gdm
 ## Install PAM files.
 mkdir -p $RPM_BUILD_ROOT/etc/pam.d
 # Generic pam config
@@ -409,7 +404,8 @@ dconf update
 %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/profile/gdm
+%ghost %{_sysconfdir}/dconf/db/gdm
+%{_sysconfdir}/dconf/profile/gdm
 # /etc/xinit.d/xdm integration
 %dir %{_libexecdir}/X11/displaymanagers
 %{_libexecdir}/X11/displaymanagers/gdm