From d7c2f810d70ce9503b37347932de54ecc852278f590aa3533807971756e8da27 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 24 May 2012 07:44:55 +0000
Subject: [PATCH] Accepting request 122014 from
 home:vuntz:branches:GNOME:Factory

Disable systemd support

OBS-URL: https://build.opensuse.org/request/show/122014
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=213
---
 gdm.changes | 10 ++++++++++
 gdm.spec    |  7 +++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/gdm.changes b/gdm.changes
index e7d94f9..d2aadc5 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu May 24 06:50:19 UTC 2012 - vuntz@opensuse.org
+
+- Re-disable systemd support as this has way too many side-effects
+  with packages that are not built with systemd support like
+  NetworkManager. For instance, NetworkManager doesn't work in the
+  user session anymore.
+- Explicitly pass --without-systemd to configure when we want to
+  disable systemd support.
+
 -------------------------------------------------------------------
 Tue May 15 16:19:10 UTC 2012 - vuntz@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index eb2b783..87c740a 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -17,8 +17,9 @@
 
 
 # We can enable systemd support only if we have xorg 1.12, as it means
-# starting X with --seat.
-%define with_systemd 0%{?suse_version} > 1210
+# starting X with --seat, and only if we build the whole system with
+# systemd support (for instance, NetworkManager).
+%define with_systemd 0
 # 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
 
@@ -262,6 +263,8 @@ autoreconf -f -i
         --enable-ipv6 \
 %if %{with_systemd}
         --with-systemd \
+%else
+        --without-systemd \
 %endif
         --with-console-kit \
 %if %{enable_split_authentication}