pool/gnome-session
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 512441 from home:fcrozat:branches:GNOME:Factory

Browse Source 
- Do not build wayland subpackage on s390/s390x, xwayland doesn't
  exist there [bsc#1047173].

OBS-URL: https://build.opensuse.org/request/show/512441
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=267
This commit is contained in:
Bjørn Lie 2017-07-26 19:15:22 +00:00 committed by Git OBS Bridge
parent 5e74f05b6b
commit c545c6bb8b
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnome-session.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jul 24 15:03:23 UTC 2017 - fcrozat@suse.com
- Do not build wayland subpackage on s390/s390x, xwayland doesn't
exist there [bsc#1047173].
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Apr 15 21:19:47 UTC 2017 - zaitor@opensuse.org Sat Apr 15 21:19:47 UTC 2017 - zaitor@opensuse.org

8
gnome-session.spec
View File

@ -78,6 +78,7 @@ Requires: gnome-shell
%description default-session %description default-session
This package contains the definition of the default GNOME session. This package contains the definition of the default GNOME session.
%ifnarch s390 s390x
%package wayland %package wayland
Summary: Session Manager for GNOME -- Wayland session Summary: Session Manager for GNOME -- Wayland session
Group: System/GUI/GNOME Group: System/GUI/GNOME
@ -87,6 +88,7 @@ Requires: xorg-x11-server-wayland
%description wayland %description wayland
This package contains the definition of the default GNOME session on Wayland. This package contains the definition of the default GNOME session on Wayland.
%endif
%package core %package core
Summary: Session Manager for GNOME -- Minimal Version Summary: Session Manager for GNOME -- Minimal Version
@ -128,6 +130,10 @@ install -m644 %{SOURCE2} %{buildroot}%{_datadir}/xsessions/gnome.desktop
%suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop %suse_update_desktop_file %{buildroot}%{_datadir}/xsessions/gnome.desktop
%find_lang %{name}-3.0 %{?no_lang_C} %find_lang %{name}-3.0 %{?no_lang_C}
%fdupes %{buildroot} %fdupes %{buildroot}
# remove wayland files on s390/s390x
%ifarch s390 s390x
rm -fr %{buildroot}%{_datadir}/wayland-sessions
%endif
%post %post
%desktop_database_post %desktop_database_post
@ -156,12 +162,14 @@ install -m644 %{SOURCE2} %{buildroot}%{_datadir}/xsessions/gnome.desktop
%{_datadir}/gnome-session/sessions/gnome.session %{_datadir}/gnome-session/sessions/gnome.session
%{_datadir}/gnome-session/sessions/gnome-dummy.session %{_datadir}/gnome-session/sessions/gnome-dummy.session
%ifnarch s390 s390x
%files wayland %files wayland
%defattr (-, root, root) %defattr (-, root, root)
%dir %{_datadir}/wayland-sessions %dir %{_datadir}/wayland-sessions
%{_datadir}/wayland-sessions/gnome.desktop %{_datadir}/wayland-sessions/gnome.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
%files core %files core
%defattr (-, root, root) %defattr (-, root, root)