[lightdm/f19: 52/53] Revert "remove systemd preset (#963899)"
Rex Dieter
rdieter at fedoraproject.org
Sun Oct 5 21:01:30 UTC 2014
commit 19bee42b648ee6c9929be25254104fa4c9e199cc
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sun Oct 5 15:34:52 2014 -0500
Revert "remove systemd preset (#963899)"
This reverts commit b446cb186eb0fce1e2c3fb617f6ad41c423f4652.
lightdm.preset | 2 ++
lightdm.spec | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/lightdm.preset b/lightdm.preset
new file mode 100644
index 0000000..e460345
--- /dev/null
+++ b/lightdm.preset
@@ -0,0 +1,2 @@
+enable lightdm.service
+disable gdm.service
diff --git a/lightdm.spec b/lightdm.spec
index 665749e..e7c6692 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -9,7 +9,7 @@
Name: lightdm
Summary: Lightweight Display Manager
Version: 1.6.0
-Release: 11%{?dist}
+Release: 10%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
@@ -21,6 +21,7 @@ Source1: lightdm.pam
Source2: lightdm-autologin.pam
Source3: lightdm-tmpfiles.conf
Source4: lightdm.service
+Source5: lightdm.preset
Source6: lightdm.rules
Patch0: lightdm-lock-screen-before-switch.patch
@@ -183,6 +184,7 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/lightdm
%if 0%{?systemd}
install -m644 -p -D %{SOURCE4} %{buildroot}%{_unitdir}/lightdm.service
+install -m644 -p -D %{SOURCE5} %{buildroot}%{_unitdir}-preset/82-fedora-lightdm.preset
install -m644 -p -D %{SOURCE6} %{buildroot}%{_datadir}/polkit-1/rules.d/lightdm.rules
%endif
@@ -228,6 +230,7 @@ fi
%dir %attr(-,lightdm,lightdm) %{_localstatedir}/cache/lightdm/
%if 0%{?systemd}
%{_unitdir}/lightdm.service
+%{_unitdir}-preset/82-fedora-lightdm.preset
%{_datadir}/polkit-1/rules.d/lightdm.rules
%endif
@@ -267,9 +270,6 @@ fi
%changelog
-* Tue Aug 20 2013 Rex Dieter <rdieter at fedoraproject.org> 1.6.0-11
-- remove systemd preset (#963899)
-
* Thu Jun 20 2013 Rex Dieter <rdieter at fedoraproject.org> 1.6.0-10
- fix systemd-logind support in -gobject bindings (#973618)
More information about the scm-commits
mailing list