From 7c2008468d83f561f3adfd69463abd5809a23a7a97834304b24b822ffafb1e17 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Thu, 3 Mar 2016 14:16:19 +0000
Subject: [PATCH] Accepting request 365433 from home:eeich:branches:X11:XOrg

- xdm.tar.bz:
  * /etc/X11/xdm/sys.xsession:
    fix regression from fix for boo#967002 (boo#968172).
  * /etc/X11/xdm/Xsession:
    + Add comments for documentation
    + Fix semantics
    + Don't use $HOME/.xinitrc as session script. Let sys.xession
      handle this.
    + Make argument parser more robust:
      add parse error detection.
  * Add an 'xsession' desktop file: this should offer a session
    where the $HOME/.xsession is used (boo#968631).

OBS-URL: https://build.opensuse.org/request/show/365433
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=121
---
 xdm.changes | 16 ++++++++++++++++
 xdm.spec    |  2 ++
 xdm.tar.bz2 |  4 ++--
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/xdm.changes b/xdm.changes
index fe1c4cf..35c166b 100644
--- a/xdm.changes
+++ b/xdm.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Feb 27 11:53:42 UTC 2016 - eich@suse.com
+
+- xdm.tar.bz:
+  * /etc/X11/xdm/sys.xsession: 
+    fix regression from fix for boo#967002 (boo#968172).
+  * /etc/X11/xdm/Xsession:
+    + Add comments for documentation
+    + Fix semantics
+    + Don't use $HOME/.xinitrc as session script. Let sys.xession
+      handle this.
+    + Make argument parser more robust:
+      add parse error detection.
+  * Add an 'xsession' desktop file: this should offer a session 
+    where the $HOME/.xsession is used (boo#968631).
+  
 -------------------------------------------------------------------
 Fri Feb 26 12:46:53 UTC 2016 - eich@suse.com
 
diff --git a/xdm.spec b/xdm.spec
index 0ba9d66..ab17b9a 100644
--- a/xdm.spec
+++ b/xdm.spec
@@ -225,6 +225,8 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm
 %{_libdir}/X11/xdm/
 %dir %{_datadir}/X11/app-defaults
 %{_datadir}/X11/app-defaults/Chooser
+%dir %{_datadir}/xsessions
+%{_datadir}/xsessions/xsession.desktop
 %{_mandir}/man1/chooser.1%{?ext_man}
 %{_mandir}/man1/xdm.1%{?ext_man}
 %if 0%{?suse_version} < 1315
diff --git a/xdm.tar.bz2 b/xdm.tar.bz2
index 5852474..a27674f 100644
--- a/xdm.tar.bz2
+++ b/xdm.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:84058c07eba515d89b0b481bf5ab8e41d0322aa7ba89d2ea853596617e95de73
-size 22344
+oid sha256:72b5fe908da6ed78b238d158f344dca8f00e8cdaea8590317bfedb8c23ecfc2b
+size 22699