[lightdm] 1.9.8-1

[Rex Dieter]

commit 266291c36795631c6f32b1f38cd653e9793e58b2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Feb 20 07:51:58 2014 -0600

    1.9.8-1
    
    - lightdm-1.9.8 (#1021834)
    - lightdm adds /usr/libexec/lightdm: to user $PATH (#888337)

 .gitignore                              |    1 +
 lightdm-1.6.0-no_dmrc_save.patch        |   12 -------
 lightdm-1.9.8-no_dmrc_save.patch        |   21 ++++++++++++
 lightdm-lock-screen-before-switch.patch |   55 -------------------------------
 lightdm.spec                            |   18 ++++++----
 sources                                 |    2 +-
 6 files changed, 33 insertions(+), 76 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 33515ff..2ca11ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /lightdm-1.8.7.tar.xz
+/lightdm-1.9.8.tar.xz
diff --git a/lightdm-1.9.8-no_dmrc_save.patch b/lightdm-1.9.8-no_dmrc_save.patch
new file mode 100644
index 0000000..3b49eb0
--- /dev/null
+++ b/lightdm-1.9.8-no_dmrc_save.patch
@@ -0,0 +1,21 @@
+diff -up lightdm-1.9.8/common/dmrc.c.no_dmrc_save lightdm-1.9.8/common/dmrc.c
+--- lightdm-1.9.8/common/dmrc.c.no_dmrc_save	2014-02-19 18:22:51.000000000 -0600
++++ lightdm-1.9.8/common/dmrc.c	2014-02-20 06:30:41.503707318 -0600
+@@ -68,6 +68,7 @@ dmrc_save (GKeyFile *dmrc_file, CommonUs
+ 
+     data = g_key_file_to_data (dmrc_file, &length, NULL);
+ 
++#if 0
+     /* Update the users .dmrc */
+     path = g_build_filename (common_user_get_home_directory (user), ".dmrc", NULL);
+ 
+@@ -81,6 +82,7 @@ dmrc_save (GKeyFile *dmrc_file, CommonUs
+         privileges_reclaim ();
+ 
+     g_free (path);
++#endif
+ 
+     /* Update the .dmrc cache */
+     cache_dir = config_get_string (config_get_instance (), "LightDM", "cache-directory");
+diff -up lightdm-1.9.8/common/user-list.c.no_dmrc_save lightdm-1.9.8/common/user-list.c
+diff -up lightdm-1.9.8/src/accounts.c.no_dmrc_save lightdm-1.9.8/src/accounts.c
diff --git a/lightdm.spec b/lightdm.spec
index 7eca035..d642913 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -4,14 +4,13 @@
 
 Name:    lightdm
 Summary: Lightweight Display Manager
-Version: 1.8.7
+Version: 1.9.8
 Release: 1%{?dist}
 
 # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
 License: (LGPLv2 or LGPLv3) and GPLv3+
-#URL:     http://www.freedesktop.org/wiki/Software/LightDM
 URL:     https://launchpad.net/lightdm/
-Source0: https://launchpad.net/lightdm/1.8/%{version}/+download/lightdm-%{version}.tar.xz
+Source0: https://launchpad.net/lightdm/1.9/%{version}/+download/lightdm-%{version}.tar.xz
 
 Source1: lightdm.pam
 Source2: lightdm-autologin.pam
@@ -19,13 +18,12 @@ Source3: lightdm-tmpfiles.conf
 Source4: lightdm.service
 Source6: lightdm.rules
 
-Patch0: lightdm-lock-screen-before-switch.patch
 ## Downstream patches:
 Patch10: lightdm-1.8.4-fedora_config.patch
 # hack in support for --nodaemon option
 Patch11: lightdm-nodaemon_option.patch
-#  disable saving to ~/.dmrc
-Patch12: lightdm-1.6.0-no_dmrc_save.patch
+#  disable saving to ~/.dmrc (runs afoul of selinux, http://bugzilla.redhat.com/963238 )
+Patch12: lightdm-1.9.8-no_dmrc_save.patch
 
 ## upstreamable patches
 # https://bugzilla.redhat.com/show_bug.cgi?id=973584
@@ -118,7 +116,6 @@ Requires: %{name}-qt%{?_isa} = %{version}-%{release}
 %prep
 %setup -q
 
-%patch0 -p1 -b .lock-screen
 %patch10 -p1 -b .fedora_config
 %patch11 -p1 -b .nodaemon_option
 %patch12 -p1 -b .no_dmrc_save
@@ -206,9 +203,10 @@ exit 0
 %config(noreplace) %{_sysconfdir}/lightdm/users.conf
 %{_bindir}/dm-tool
 %{_sbindir}/lightdm
-%{_libexecdir}/lightdm/
+%{_libexecdir}/lightdm-guest-session
 %{_datadir}/lightdm/
 %{_libdir}/girepository-1.0/LightDM-1.typelib
+%{_mandir}/man1/dm-tool.1*
 %{_mandir}/man1/lightdm*
 %dir %attr(-,lightdm,lightdm) %{_localstatedir}/cache/lightdm/
 %{_unitdir}/lightdm.service
@@ -250,6 +248,10 @@ exit 0
 
 
 %changelog
+* Thu Feb 20 2014 Rex Dieter <rdieter at fedoraproject.org> 1.9.8-1
+- lightdm-1.9.8 (#1021834)
+- lightdm adds /usr/libexec/lightdm: to user $PATH (#888337)
+
 * Thu Feb 06 2014 Rex Dieter <rdieter at fedoraproject.org> 1.8.7-1
 - lightdm-1.8.7
 
diff --git a/sources b/sources
index 3c99565..1531da9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b97b1eec5d7074334f6c1d5cda2868d5  lightdm-1.8.7.tar.xz
+dcd37257fe672235e246a3abf1c5273b  lightdm-1.9.8.tar.xz