SHA256
1
0
forked from pool/xdm

- 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
This commit is contained in:
2016-03-30 13:45:44 +00:00
committed by Git OBS Bridge
parent 25baf78509
commit 63da56926d
4 changed files with 39 additions and 4 deletions

View File

@@ -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