From e594a09d6726be86fedc39d31a7e0e3baf03d910 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Nov 25 2015 17:39:09 +0000
Subject: 1.10.6-2


- enable libaudit support
- (re)enable hardening for f23+, at least (#956868)
- disable tests
- drop now-unused lightdm.pam.f19

---

diff --git a/lightdm.pam.f19 b/lightdm.pam.f19
deleted file mode 100644
index a4e7619..0000000
--- a/lightdm.pam.f19
+++ /dev/null
@@ -1,26 +0,0 @@
-#%PAM-1.0
-auth     [success=done ignore=ignore default=bad] pam_selinux_permit.so
-auth       required    pam_env.so
-auth       substack    system-auth
--auth       optional    pam_gnome_keyring.so
--auth       optional    pam_mate_keyring.so
--auth       optional    pam_kwallet5.so
--auth       optional    pam_kwallet.so
-auth       include     postlogin
-account    required    pam_nologin.so
-account    include     system-auth
-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
--session    optional    pam_gnome_keyring.so auto_start
--session    optional    pam_mate_keyring.so auto_start
--session    optional    pam_kwallet5.so
--session    optional    pam_kwallet.so
-session    include     system-auth
-session    optional    pam_lastlog.so silent
-session    include     postlogin
diff --git a/lightdm.spec b/lightdm.spec
index f3e0c76..6e36612 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -1,11 +1,16 @@
 
 # Disable hardening, crashes https://bugzilla.redhat.com/956868
+# seems to be ok on f23+ so, allow there at least -- rex
+%if 0%{?fedora} < 23
 %undefine _hardened_build
+%endif
+# FIXME: most tests currently fail
+#define tests 1
 
 Name:    lightdm
 Summary: A cross-desktop Display Manager
 Version: 1.10.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
 License: (LGPLv2 or LGPLv3) and GPLv3+
@@ -13,7 +18,6 @@ URL:     https://launchpad.net/lightdm/1.10
 Source0: https://launchpad.net/lightdm/1.10/%{version}/+download/lightdm-%{version}.tar.xz
 
 Source1: lightdm.pam
-Source10: lightdm.pam.f19
 Source2: lightdm-autologin.pam
 Source3: lightdm-tmpfiles.conf
 Source4: lightdm.service
@@ -37,6 +41,7 @@ BuildRequires: gtk-doc itstool
 BuildRequires: intltool
 BuildRequires: libgcrypt-devel
 BuildRequires: pam-devel
+BuildRequires: pkgconfig(audit)
 BuildRequires: pkgconfig(dbus-glib-1)
 BuildRequires: pkgconfig(gio-2.0) >= 2.26
 BuildRequires: pkgconfig(gio-unix-2.0)
@@ -148,7 +153,7 @@ sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
   --enable-liblightdm-qt \
   --enable-liblightdm-qt5 \
   --enable-introspection \
-  --enable-tests \
+  %{?tests:--enable-tests}%{!?tests:--disable-tests} \
   --with-greeter-user=lightdm \
   --with-greeter-session=lightdm-greeter
 
@@ -167,11 +172,7 @@ rm -rfv %{buildroot}%{_sysconfdir}/apparmor.d/
 rm -rfv %{buildroot}%{_sysconfdir}/init
 
 # install pam file
-%if 0%{?fedora} == 19
-install -Dpm 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/lightdm
-%else
 install -Dpm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pam.d/lightdm
-%endif
 install -Dpm 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin
 
 install -Dpm 644 %{SOURCE3} %{buildroot}%{_prefix}/lib/tmpfiles.d/lightdm.conf
@@ -193,7 +194,9 @@ install -m644 -p -D %{SOURCE6} %{buildroot}%{_datadir}/polkit-1/rules.d/lightdm.
 
 %check
 # FIXME: most of these currently fail :( -- rex
+%if 0%{?tests:1}
 make check ||:
+%endif
 
 
 %pre
@@ -281,6 +284,12 @@ exit 0
 
 
 %changelog
+* Wed Nov 25 2015 Rex Dieter <rdieter@fedoraproject.org> - 1.10.6-2
+- enable libaudit support
+- (re)enable hardening for f23+, at least (#956868)
+- disable tests
+- drop now-unused lightdm.pam.f19
+
 * Fri Nov 20 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.6-1
 - 1.10.6