Attachment 603009 Details for Bug 846145 – Proposed patch

[patch] Proposed patch

kdm-systemd.patch (text/plain), 2.73 KB, created by Martin Bříza on 2012-08-08 12:25:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Bříza

Created: 2012-08-08 12:25:12 UTC

Size: 2.73 KB

patch

obsolete

>diff --git a/kde-workspace.spec b/kde-workspace.spec
>index 3ee96f0..3a29cee 100644
>--- a/kde-workspace.spec
>+++ b/kde-workspace.spec
>@@ -12,7 +12,7 @@
> Summary: KDE Workspace
> Name:    kde-workspace
> Version: 4.9.0
>-Release: 3%{?dist}
>+Release: 4%{?dist}
> 
> License: GPLv2
> URL:     https://projects.kde.org/projects/kde/kde-workspace
>@@ -23,6 +23,7 @@ URL:     https://projects.kde.org/projects/kde/kde-workspace
> %global stable stable
> %endif
> Source0: ftp://ftp.kde.org/pub/kde/%{stable}/%{version}/src/kde-workspace-%{version}.tar.xz
>+Source1: kdm.service
> BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> # RH/Fedora-specific startkde changes
>@@ -299,6 +300,10 @@ The Color Selection module is comprised of several sections:
> Summary: The KDE login manager
> Provides: kdebase-kdm = %{version}-%{release}
> Provides: service(graphical-login) = kdm
>+BuildRequires: systemd
>+Requires(post): systemd
>+Requires(preun): systemd
>+Requires(postun): systemd
> Requires: kgreeter-plugins = %{version}-%{release}
> Requires: libkworkspace%{?_isa} =  %{version}-%{release}
> Requires: kde-settings-kdm
>@@ -306,6 +311,12 @@ Requires: kde-settings-kdm
> # prevent "Cannot open ConsoleKit session" when logging in (#787855)
> Requires: ConsoleKit-x11
> %endif
>+%post -n kdm
>+%{systemd_post} kdm.service
>+%preun -n kdm
>+%{systemd_preun} kdm.service
>+%postun -n kdm
>+%{systemd_postun}
> %description -n kdm
> KDM provides the graphical login screen, shown shortly after boot up,
> log out, and when user switching.
>@@ -502,6 +513,10 @@ pushd %{buildroot}%{_kde4_appsdir}/kdm/faces
> ln -sf ../pics/users/%{default_face_icon} .default.face.icon
> popd
> 
>+# systemd
>+mkdir -p $RPM_BUILD_ROOT%{_unitdir}
>+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/kdm.service
>+
> ## unpackaged files
> 
> 
>@@ -877,6 +892,7 @@ fi
> %{_kde4_appsdir}/kdm/programs/
> %dir %{_kde4_appsdir}/kdm/themes/
> %{_kde4_datadir}/kde4/services/kdm.desktop
>+%{_unitdir}/kdm.service
> 
> %files -n kdm-themes
> %defattr(-,root,root,-)
>@@ -998,6 +1014,9 @@ fi
> 
> 
> %changelog
>+* Wed Aug 08 2012 Martin Briza <mbriza@redhat.com> 4.9.0-4
>+- Added systemd service file for https://fedoraproject.org/wiki/Features/DisplayManagerRework (#846145)
>+
> * Tue Aug 07 2012 Rex Dieter <rdieter@fedoraproject.org> 4.9.0-3
> - window keeps status 'asking for attention' after gaining focus (kde#303208)
> 
>diff --git a/kdm.service b/kdm.service
>new file mode 100644
>index 0000000..dde2a58
>--- /dev/null
>+++ b/kdm.service
>@@ -0,0 +1,13 @@
>+[Unit]
>+Description=The KDE login manager
>+Conflicts=getty@tty1.service
>+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
>+Conflicts=plymouth-quit.service
>+
>+[Service]
>+ExecStart=/usr/bin/kdm vt1
>+Restart=always
>+IgnoreSIGPIPE=no
>+
>+[Install]
>+Alias=display-manager.service

Actions: View | Diff

Attachments on bug 846145: 603009