From 63da56926defc6eba4e24b5423726641ad010792e2fb2a7aad5815b57654350f Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.com>
Date: Wed, 30 Mar 2016 13:45:44 +0000
Subject: [PATCH] - xsession.desktop file:   * created xsession sub-package for
 this file.   * changed descriptive message to "User/System Default"  
 (boo#971852).

- xdm.tar.bz:
  Fixed Xsession script to cull the locale form the arguments before
  passing them on (boo#973045).

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=125
---
 xdm.changes      | 15 +++++++++++++++
 xdm.spec         | 19 +++++++++++++++++--
 xdm.tar.bz2      |  4 ++--
 xsession.desktop |  5 +++++
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 xsession.desktop

diff --git a/xdm.changes b/xdm.changes
index 8c89b74..67eb7ca 100644
--- a/xdm.changes
+++ b/xdm.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Mar 30 13:42:53 UTC 2016 - eich@suse.com
+
+- xsession.desktop file:
+  * created xsession sub-package for this file.
+  * changed descriptive message to "User/System Default"
+  (boo#971852).
+
+-------------------------------------------------------------------
+Wed Mar 30 13:40:00 UTC 2016 - eich@suse.com
+
+- xdm.tar.bz:
+  Fixed Xsession script to cull the locale form the arguments before
+  passing them on (boo#973045).
+
 -------------------------------------------------------------------
 Thu Mar  3 15:31:51 UTC 2016 - eich@suse.com
 
diff --git a/xdm.spec b/xdm.spec
index dbd5a74..a4ace6a 100644
--- a/xdm.spec
+++ b/xdm.spec
@@ -42,6 +42,7 @@ Source1:        xdm.tar.bz2
 Source2:        HOWTO.xdm
 Source3:        xdm-fallbacks.tar.bz2
 Source4:        display-manager.service
+Source5:        xsession.desktop
 %if !%with_systemd
 Patch0:         xdm-consolekit.diff
 %endif
@@ -100,6 +101,17 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Xdm manages a collection of X displays, which may be on the local host
 or remote servers.
 
+%package xsession
+Summary:        User/System Xsession Desktop File
+Group:          System/X11/Utilities
+Requires:       xdm
+Supplements:    xdm
+
+%description xsession
+This package contains the System desktop file which will cause 
+the execution of a user provided $HOME/.xsession script or pick 
+the system wide DM default set in /etc/sysconfig/displaymanager.
+
 %prep
 %setup -q
 cp %{SOURCE2} .
@@ -146,6 +158,7 @@ rm %{buildroot}%{_libdir}/X11/xdm/libXdmGreet.la
 mv %{buildroot}%{_libdir}/X11/xdm/chooser %{buildroot}%{_bindir}
 # fdo#35868 (closed INVALID, but because of above fix, we want it)
 ln -s xdm.1%{?ext_man} %{buildroot}%{_mandir}/man1/chooser.1%{?ext_man}
+%__install -D %{S:5} -m 0644 %{buildroot}%{_datadir}/xsessions/xsession.desktop
 %if 0%{?suse_version} < 1315
 # missing manual page
 mkdir -p %{buildroot}%{_mandir}/man8
@@ -228,8 +241,6 @@ 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
@@ -239,4 +250,8 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm
 %dir %{_libdir}/X11
 %endif
 
+%files xsession
+%dir %{_datadir}/xsessions
+%{_datadir}/xsessions/xsession.desktop
+
 %changelog
diff --git a/xdm.tar.bz2 b/xdm.tar.bz2
index a27674f..2d1a4b8 100644
--- a/xdm.tar.bz2
+++ b/xdm.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72b5fe908da6ed78b238d158f344dca8f00e8cdaea8590317bfedb8c23ecfc2b
-size 22699
+oid sha256:ed5bcd338ce457861ef5350c2bc3a2a30cdd050be0e8f082845406251456c706
+size 22523
diff --git a/xsession.desktop b/xsession.desktop
new file mode 100644
index 0000000..cfae16e
--- /dev/null
+++ b/xsession.desktop
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=User/System Default
+Type=Xsession
+Encoding=UTF-8
+Exec=default