[lightdm/f19: 43/53] Revert "sync scriptlets with f20+ branch"

[Rex Dieter]

commit 58795fc8366a7e14f4cfc275ed91d55c4d4e5938
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sun Oct 5 15:34:52 2014 -0500

    Revert "sync scriptlets with f20+ branch"
    
    This reverts commit a03afc0527626b8f546e9489c6b0296e1e052a2d.

 lightdm.spec |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/lightdm.spec b/lightdm.spec
index 58790ee..c3f7d6b 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -9,7 +9,7 @@
 Name:    lightdm
 Summary: Lightweight Display Manager
 Version: 1.6.3
-Release: 3%{?dist}
+Release: 2%{?dist}
 
 # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
 License: (LGPLv2 or LGPLv3) and GPLv3+
@@ -62,7 +62,6 @@ BuildRequires: pkgconfig(QtNetwork)
 BuildRequires: pkgconfig(x11)
 BuildRequires: pkgconfig(xcb)
 BuildRequires: pkgconfig(xdmcp)
-BuildRequires: systemd
 BuildRequires: vala
 
 Requires: %{name}-gobject%{?_isa} = %{version}-%{release}
@@ -196,11 +195,19 @@ install -m644 -p -D %{SOURCE6} %{buildroot}%{_datadir}/polkit-1/rules.d/lightdm.
 %pre
 getent group lightdm >/dev/null || groupadd -r lightdm
 getent passwd lightdm >/dev/null || \
-  /usr/sbin/useradd -g lightdm -M -d /var/lib/lightdm -s /sbin/nologin -r lightdm
+  /usr/sbin/useradd -g lightdm -M -d /var/lib/lightdm -s /sbin/nologin -r lightdm > /dev/null 2>&1
+## ignore errors, as we can't disambiguate between lightdm already existed
+## and couldn't create account with the current adduser.
 exit 0
 
 %post
 %{?systemd_post:%systemd_post lightdm.service}
+%if 0
+# tweak selinux to work out-of-the-box, see also: http://bugzilla.redhat.com/963238
+if [ "`getsebool xdm_write_home 2>/dev/null`" == 'xdm_write_home --> off' ] ; then
+  setsebool -P xdm_write_home on &> /dev/null ||:
+fi
+%endif
 
 %preun
 %{?systemd_preun:%systemd_preun lightdm.service}
@@ -265,9 +272,6 @@ exit 0
 
 
 %changelog
-* Mon Nov 11 2013 Rex Dieter <rdieter at fedoraproject.org> 1.6.3-3
-- sync scriptlets with f20+ branch
-
 * Tue Oct 08 2013 Rex Dieter <rdieter at fedoraproject.org> 1.6.3-2
 - lightdm user home /var/lib/lightdm (instead of /var/log/lightdm)