[xorg-x11-xdm] Display manager rework

[Peter Hutterer]

commit 2e5b521843d53091f23fe5a09f9cdb140a480afc
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Aug 7 12:16:48 2012 +0200

    Display manager rework
    
    https://fedoraproject.org/wiki/Features/DisplayManagerRework
    https://bugzilla.redhat.com/show_bug.cgi?id=846143

 xdm-service.patch |   19 +++++++++++++++++++
 xorg-x11-xdm.spec |   25 +++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/xdm-service.patch b/xdm-service.patch
new file mode 100644
index 0000000..a614f98
--- /dev/null
+++ b/xdm-service.patch
@@ -0,0 +1,19 @@
+--- xdm-1.1.11/xdm.service.in	2011-09-25 09:35:47.000000000 +0200
++++ xdm-1.1.11.save/xdm.service.in	2012-08-07 12:08:24.620127471 +0200
+@@ -1,9 +1,13 @@
+ [Unit]
+-Description=X-Window Display Manager
+-After=systemd-user-sessions.service
++Description=X11 Display Manager
++Documentation=man:xdm(1)
++Conflicts=getty at tty1.service
++After=systemd-user-sessions.service getty at tty1.service plymouth-quit.service
+
+ [Service]
+ ExecStart=BINDIR/xdm -nodaemon
++Restart=always
++IgnoreSIGPIPE=no
+
+ [Install]
+-Alias=graphical.target.wants/xdm.service
++Alias=display-manager.service
diff --git a/xorg-x11-xdm.spec b/xorg-x11-xdm.spec
index e90d83a..b2768d3 100644
--- a/xorg-x11-xdm.spec
+++ b/xorg-x11-xdm.spec
@@ -3,7 +3,7 @@
 Summary: X.Org X11 xdm - X Display Manager
 Name: xorg-x11-%{pkgname}
 Version: 1.1.11
-Release: 3%{?dist}
+Release: 4%{?dist}
 # NOTE: Remove Epoch line if/when the package ever gets renamed.
 Epoch: 1
 License: MIT
@@ -24,6 +24,9 @@ Patch14: xdm-1.1.10-libdl.patch
 # send a USER_LOGIN event like other login programs do. 
 Patch15: xdm-1.1.10-add-audit-event.patch
 
+# systemd unit file update
+Patch16: xdm-service.patch
+
 # FIXME: Temporary build dependencies for autotool dependence.
 BuildRequires: autoconf, automake, libtool
 
@@ -54,7 +57,10 @@ BuildRequires: libXft-devel
 # Add libaudit support
 BuildRequires: audit-libs-devel
 # systemd support
-BuildRequires: systemd-units
+BuildRequires: systemd
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
 
 # FIXME:These old provides should be removed
 Provides: xdm
@@ -73,6 +79,7 @@ X.Org X11 xdm - X Display Manager
 %patch11 -p0 -b .redhat-sessreg-utmp-fix-bug177890
 #%_patch14 -p1 -b .add-needed
 %patch15 -p1 -b .add-audit-events
+%patch16 -p1 -b .systemd
 
 %build
 autoreconf -v --install
@@ -111,6 +118,15 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/Xsession
 # 500704)
 mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/xdm
 
+%post
+%systemd_post xdm.service
+
+%preun
+%systemd_preun xdm.service
+
+%postun
+%systemd_postun
+
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog
@@ -149,6 +165,11 @@ mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/xdm
 %{_unitdir}/xdm.service
 
 %changelog
+* Tue Aug  7 2012 Lennart Poettering <lpoetter at redhat.com> - 1:1.1.11-4
+- Display Manager Rework
+- https://fedoraproject.org/wiki/Features/DisplayManagerRework
+- https://bugzilla.redhat.com/show_bug.cgi?id=846143
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.1.11-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild