From 2dc1997784dcd408a1d54275010fafa6e17c14aaa49648b13e8253ac19c368db Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 28 Mar 2012 08:21:22 +0000
Subject: [PATCH] Accepting request 111506 from
 home:vuntz:branches:GNOME:Factory

Update to 3.4.0.1 + disable systemd support

OBS-URL: https://build.opensuse.org/request/show/111506
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=207
---
 gdm-3.4.0.1.tar.xz |  3 +++
 gdm-3.4.0.tar.xz   |  3 ---
 gdm.changes        | 16 ++++++++++++++++
 gdm.spec           | 11 ++++++++---
 4 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 gdm-3.4.0.1.tar.xz
 delete mode 100644 gdm-3.4.0.tar.xz

diff --git a/gdm-3.4.0.1.tar.xz b/gdm-3.4.0.1.tar.xz
new file mode 100644
index 0000000..6590f45
--- /dev/null
+++ b/gdm-3.4.0.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:08686e32f35f65fc5578b48db802fc5e5ca4ca3c3adbbe0d2488ddc1c6f279cd
+size 1606064
diff --git a/gdm-3.4.0.tar.xz b/gdm-3.4.0.tar.xz
deleted file mode 100644
index 61a8c79..0000000
--- a/gdm-3.4.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f0da2dda1801010c223c051d5929989553004a6eec2463b43150eaf79514fa71
-size 1606612
diff --git a/gdm.changes b/gdm.changes
index 65c3ef0..7f99923 100644
--- a/gdm.changes
+++ b/gdm.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Mar 28 08:09:57 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 3.4.0.1:
+  + Fix autologin
+- Remove xz BuildRequires now that it comes for free in the build
+  system.
+- Temporarily disable systemd support as it breaks on Factory
+  because of our old Xorg (bnc#753498):
+  + Add a with_systemd macro, set to 0.
+  + Only use --with-systemd configure option if with_systemd is set
+    to 1.
+  + Only use pkgconfig(libsystemd-daemon) and
+    pkgconfig(libsystemd-login) BuildRequires if with_systemd is
+    set to 1.
+
 -------------------------------------------------------------------
 Tue Mar 27 07:18:45 UTC 2012 - vuntz@opensuse.org
 
diff --git a/gdm.spec b/gdm.spec
index 7d7ff0b..90bd519 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,11 +16,14 @@
 #
 
 
+# We cannot enable systemd support right now, as it means starting X with
+# --seat, which doesn't work until we get xorg 1.12
+%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
 
 Name:           gdm
-Version:        3.4.0
+Version:        3.4.0.1
 Release:        0
 Summary:        The GNOME Display Manager
 License:        GPL-2.0+
@@ -92,11 +95,11 @@ BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  xorg-x11-server
 BuildRequires:  xorg-x11-server-extra
-# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467
-BuildRequires:  xz
 BuildRequires:  pkgconfig(accountsservice)
+%if %{with_systemd}
 BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  pkgconfig(libsystemd-login)
+%endif
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xau)
@@ -257,7 +260,9 @@ autoreconf -f -i
         --with-check-accelerated-directory=%{_libexecdir} \
         --with-selinux \
         --enable-ipv6 \
+%if %{with_systemd}
         --with-systemd \
+%endif
         --with-console-kit \
 %if %{enable_split_authentication}
         --enable-split-authentication \