Commit bb8baf23 authored by Rex Dieter's avatar Rex Dieter
Browse files

Merge branch 'master' into epel7

parents 57f3e9be a8b8bca1
......@@ -3,6 +3,7 @@ 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_kwallet5.so
-auth optional pam_kwallet.so
auth include postlogin
account required pam_nologin.so
......@@ -16,6 +17,7 @@ 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_kwallet5.so
-session optional pam_kwallet.so
session include system-auth
session optional pam_lastlog.so silent
......
......@@ -4,6 +4,7 @@ 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
......@@ -18,6 +19,7 @@ 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
......
......@@ -3,9 +3,9 @@
%undefine _hardened_build
Name: lightdm
Summary: Lightweight Display Manager
Summary: A cross-desktop Display Manager
Version: 1.10.5
Release: 3%{?dist}
Release: 6%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
......@@ -78,12 +78,10 @@ Requires: lightdm-greeter = 1.2
Provides: service(graphical-login) = lightdm
%description
LightDM is an X display manager that:
* Has a lightweight codebase
* Is standards compliant (PAM, ConsoleKit, etc)
* Has a well defined interface between the server and user interface
* Fully themeable (easiest with the webkit interface)
* Cross-desktop (greeters can be written in any toolkit)
Lightdm is a display manager that:
* Is cross-desktop - supports different desktops
* Supports different display technologies
* Is lightweight - low memory usage and fast performance
%package gobject
Summary: LightDM GObject client library
......@@ -141,7 +139,9 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
%patch12 -p1 -b .no_dmrc_save
%patch51 -p1 -b .qtchooser
%if 0%{?fedora} > 21
%patch52 -p1 -b .listen
%endif
# rpath hack
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
......@@ -287,6 +287,15 @@ exit 0
%changelog
* Tue Oct 06 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.5-6
- drop listen.patch for < f22 (#1269247)
* Thu Sep 24 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.5-5
- update Summary/%%description
* Thu Sep 10 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.5-4
- lightdm.pam: add pam_kwallet5 support
* Tue Sep 08 2015 Rex Dieter <rdieter@fedoraproject.org> 1.10.5-3
- rework -qtchooser.patch to avoid autoreconf'ing (fixes epel7 build)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment