Accepting request 535092 from home:xiaoguang_wang:branches:GNOME:Factory

- Make default.desktop session working on wayland.
  Add default.desktop file in '{_datadir}/wayland-sessions/'
  (bsc#1062196).

OBS-URL: https://build.opensuse.org/request/show/535092
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=282
This commit is contained in:
Dominique Leuenberger 2017-10-20 14:36:09 +00:00 committed by Git OBS Bridge
parent 84b1914795
commit 83867f0f55
2 changed files with 19 additions and 0 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Oct 19 04:57:29 UTC 2017 - xwang@suse.com
- Make default.desktop session working on wayland.
Add default.desktop file in '{_datadir}/wayland-sessions/'
(bsc#1062196).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 4 12:29:23 UTC 2017 - zaitor@opensuse.org Wed Oct 4 12:29:23 UTC 2017 - zaitor@opensuse.org

View File

@ -140,6 +140,8 @@ rm -fr %{buildroot}%{_datadir}/wayland-sessions
mkdir -p %{buildroot}%{_sysconfdir}/alternatives mkdir -p %{buildroot}%{_sysconfdir}/alternatives
touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop
ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop
touch %{buildroot}%{_sysconfdir}/alternatives/default-waylandsession.desktop
ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_datadir}/wayland-sessions/default.desktop
%post %post
%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ %{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \
@ -163,10 +165,20 @@ ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadi
%{_datadir}/gnome-session/sessions/gnome-dummy.session %{_datadir}/gnome-session/sessions/gnome-dummy.session
%ifnarch s390 s390x %ifnarch s390 s390x
%post wayland
%{_sbindir}/update-alternatives --install %{_datadir}/wayland-sessions/default.desktop \
default-waylandsession.desktop %{_datadir}/wayland-sessions/gnome.desktop 25
%postun wayland
[ -f %{_datadir}/wayland-sessions/gnome.desktop ] || %{_sbindir}/update-alternatives \
--remove default-waylandsession.desktop %{_datadir}/wayland-sessions/gnome.desktop
%files wayland %files wayland
%defattr (-, root, root) %defattr (-, root, root)
%dir %{_datadir}/wayland-sessions %dir %{_datadir}/wayland-sessions
%{_datadir}/wayland-sessions/default.desktop
%{_datadir}/wayland-sessions/gnome.desktop %{_datadir}/wayland-sessions/gnome.desktop
%ghost %{_sysconfdir}/alternatives/default-waylandsession.desktop
# Disabled as wayland is now the default session again. # Disabled as wayland is now the default session again.
#{_datadir}/wayland-sessions/gnome-wayland.desktop #{_datadir}/wayland-sessions/gnome-wayland.desktop
%endif %endif