Attachment 602710 Details for Bug 846143 – patch for .spec

[patch] patch for .spec

0001-Display-manager-rework.patch (text/plain), 2.89 KB, created by Lennart Poettering on 2012-08-07 10:19:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lennart Poettering

Created: 2012-08-07 10:19:00 UTC

Size: 2.89 KB

patch

obsolete

>From df47075561e343c77014d92435c498bc1e12d0ab Mon Sep 17 00:00:00 2001
>From: Lennart Poettering <lennart@poettering.net>
>Date: Tue, 7 Aug 2012 12:16:48 +0200
>Subject: [PATCH] Display manager rework
>
>https://fedoraproject.org/wiki/Features/DisplayManagerRework
>---
> xdm-service.patch | 19 +++++++++++++++++++
> xorg-x11-xdm.spec | 22 +++++++++++++++++++++-
> 2 files changed, 40 insertions(+), 1 deletion(-)
> create mode 100644 xdm-service.patch
>
>diff --git a/xdm-service.patch b/xdm-service.patch
>new file mode 100644
>index 0000000..cd95418
>--- /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@tty1.service plymouth-quit.service
>++After=systemd-user-sessions.service getty@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..432e16d 100644
>--- a/xorg-x11-xdm.spec
>+++ b/xorg-x11-xdm.spec
>@@ -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,10 @@ mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/xdm
> %{_unitdir}/xdm.service
> 
> %changelog
>+* Tue Aug  7 2012 Lennart Poettering <lpoetter@redhat.com> - 1:1.1.11-3
>+- Display Manager Rework
>+- https://fedoraproject.org/wiki/Features/DisplayManagerRework
>+
> * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.1.11-3
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>-- 
>1.7.11.2
>

Actions: View | Diff

Attachments on bug 846143: 602710 | 602723