Hello community,
here is the log from the commit of package xdm for openSUSE:Factory checked in
at 2016-04-05 10:41:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdm (Old)
and /work/SRC/openSUSE:Factory/.xdm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2016-03-07 15:02:31.000000000
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2016-04-05
10:41:34.000000000 +0200
@@ -1,0 +2,15 @@
+Wed Mar 30 13:42:53 UTC 2016 - e...@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 - e...@suse.com
+
+- xdm.tar.bz:
+ Fixed Xsession script to cull the locale form the arguments before
+ passing them on (boo#973045).
+
+-------------------------------------------------------------------
New:
----
xsession.desktop
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdm.spec ++++++
--- /var/tmp/diff_new_pack.k6YFfr/_old 2016-04-05 10:41:36.000000000 +0200
+++ /var/tmp/diff_new_pack.k6YFfr/_new 2016-04-05 10:41:36.000000000 +0200
@@ -42,6 +42,7 @@
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 @@
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 @@
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 @@
%{_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 @@
%dir %{_libdir}/X11
%endif
+%files xsession
+%dir %{_datadir}/xsessions
+%{_datadir}/xsessions/xsession.desktop
+
%changelog
++++++ xdm.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession
--- old/etc/X11/xdm/Xsession 2016-03-01 16:02:42.000000000 +0100
+++ new/etc/X11/xdm/Xsession 2016-03-30 14:56:14.000000000 +0200
@@ -216,6 +216,7 @@
;;
[a-z][a-z]_[A-Z][A-Z]*)
export GDM_LANG=$l
+ unset argv[$argc] # remove from command line: not an argument
test $extra_env_settings = yes && parse_error=1
;;
*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/usr/share/xsessions/xsession.desktop
new/usr/share/xsessions/xsession.desktop
--- old/usr/share/xsessions/xsession.desktop 2016-02-27 12:51:11.000000000
+0100
+++ new/usr/share/xsessions/xsession.desktop 1970-01-01 01:00:00.000000000
+0100
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Name=User Xsession
-Type=Xsession
-Encoding=UTF-8
-Exec=default
++++++ xsession.desktop ++++++
[Desktop Entry]
Name=User/System Default
Type=Xsession
Encoding=UTF-8
Exec=default
