[lightdm] 1.3.2-7

[Rex Dieter]

commit 4507f80d6b4656f28fa36b350166a4cadb1ab774
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Aug 10 09:46:46 2012 -0500

    1.3.2-7
    
    - conditionalize systemd unit support
    - lightdm.pam: +-session optional pam_ck_connector.so

 lightdm.pam  |    1 +
 lightdm.spec |   25 +++++++++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/lightdm.pam b/lightdm.pam
index ff7b155..81c3b05 100644
--- a/lightdm.pam
+++ b/lightdm.pam
@@ -10,6 +10,7 @@ password   include     system-auth
 session    required    pam_selinux.so close
 session    required    pam_loginuid.so
 session    optional    pam_console.so
+-session    optional    pam_ck_connector.so
 session    required    pam_selinux.so open
 session    optional    pam_keyinit.so force revoke
 session    required    pam_namespace.so
diff --git a/lightdm.spec b/lightdm.spec
index e2fb5b1..6d07b30 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -1,7 +1,13 @@
+
+%if 0%{?fedora} > 17
+# conditionalize systemd unit support (consider -systemd subpkg? --rex)
+%define systemd 1
+%endif
+
 Name:    lightdm
 Summary: Lightweight Display Manager
 Version: 1.3.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 # library/bindings are LGPLv3, the rest GPLv3+
 License: LGPLv3+ and GPLv3+
@@ -63,10 +69,12 @@ Requires: lightdm-greeter = 1.2
 # needed for anaconda to boot into runlevel 5 after install
 Provides: service(graphical-login) = lightdm
 
+%if 0%{?systemd}
 BuildRequires:    systemd
 Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
+%endif
 
 %description
 LightDM is an X display manager that:
@@ -152,8 +160,10 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/%{name}
 
 %find_lang %{name} --with-gnome
 
-mkdir -p $RPM_BUILD_ROOT%{_unitdir}
-install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/lightdm.service
+%if 0%{?systemd}
+install -m644 -p -D %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/lightdm.service
+%endif
+
 
 %pre
 getent group lightdm >/dev/null || groupadd -r lightdm
@@ -163,6 +173,7 @@ getent passwd lightdm >/dev/null || \
 ## and couldn't create account with the current adduser.
 exit 0
 
+%if 0%{?systemd}
 %post
 %systemd_post lightdm.service
 
@@ -171,7 +182,7 @@ exit 0
 
 %postun
 %systemd_postun
-
+%endif
 
 %files -f %{name}.lang
 %doc COPYING
@@ -189,7 +200,9 @@ exit 0
 %{_libdir}/girepository-1.0/LightDM-1.typelib
 %{_mandir}/man*/lightdm.*.*
 %dir %attr(-,lightdm,lightdm) %{_localstatedir}/cache/lightdm/
+%if 0%{?systemd}
 %{_unitdir}/lightdm.service
+%endif
 
 # because of systemd
 %{_prefix}/lib/tmpfiles.d/lightdm.conf
@@ -227,6 +240,10 @@ exit 0
 
 
 %changelog
+* Fri Aug 10 2012 Rex Dieter <rdieter at fedoraproject.org> - 1.3.2-7
+- conditionalize systemd unit support
+- lightdm.pam: +-session optional pam_ck_connector.so
+
 * Tue Aug  7 2012 Lennart Poettering <lpoetter at redhat.com> - 1.3.2-6
 - Add bus name to service file