From 2f600dd25e94272f8a70700c7d42868da8a909efd1739e725870faeef855aa26 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 27 Feb 2018 04:00:05 +0000 Subject: [PATCH 1/3] Accepting request 580286 from home:oertel:branches:GNOME:Factory - fix build on s390/s390x without wayland OBS-URL: https://build.opensuse.org/request/show/580286 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=286 --- gnome-session.changes | 5 +++++ gnome-session.spec | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gnome-session.changes b/gnome-session.changes index c1b16ff..9581174 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 26 16:44:00 CET 2018 - ro@suse.de + +- fix build on s390/s390x without wayland + ------------------------------------------------------------------- Sun Dec 24 15:19:46 UTC 2017 - zaitor@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index be03ff3..b135e2c 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -1,7 +1,7 @@ # # spec file for package gnome-session # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -143,8 +143,10 @@ rm -fr %{buildroot}%{_datadir}/wayland-sessions mkdir -p %{buildroot}%{_sysconfdir}/alternatives touch %{buildroot}%{_sysconfdir}/alternatives/default-xsession.desktop ln -s %{_sysconfdir}/alternatives/default-xsession.desktop %{buildroot}%{_datadir}/xsessions/default.desktop +%ifnarch s390 s390x touch %{buildroot}%{_sysconfdir}/alternatives/default-waylandsession.desktop ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_datadir}/wayland-sessions/default.desktop +%endif %post %{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \ From d46550acf878001d79471bc7053e42589f114223b03e5ad95524d55cf9b18270 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 27 Feb 2018 04:00:45 +0000 Subject: [PATCH 2/3] - Fix build on s390/s390x without wayland: do not setup the system for default-waylandsession alternatives. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=287 --- gnome-session.changes | 3 ++- gnome-session.spec | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gnome-session.changes b/gnome-session.changes index 9581174..03ef156 100644 --- a/gnome-session.changes +++ b/gnome-session.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Mon Feb 26 16:44:00 CET 2018 - ro@suse.de -- fix build on s390/s390x without wayland +- Fix build on s390/s390x without wayland: do not setup the system + for default-waylandsession alternatives. ------------------------------------------------------------------- Sun Dec 24 15:19:46 UTC 2017 - zaitor@opensuse.org diff --git a/gnome-session.spec b/gnome-session.spec index b135e2c..c716e41 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -20,7 +20,7 @@ Name: gnome-session Version: 3.26.1 Release: 0 Summary: Session Tools for the GNOME Desktop -License: GPL-2.0+ +License: GPL-2.0-or-later Group: System/GUI/GNOME Url: http://www.gnome.org Source: http://download.gnome.org/sources/gnome-session/3.26/%{name}-%{version}.tar.xz From 612f87d215c349dc3260202c314180d6eaae95b33c3185cb47e990c3019a4932 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 27 Feb 2018 04:01:10 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-session?expand=0&rev=288 --- gnome-session.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnome-session.spec b/gnome-session.spec index c716e41..7252df5 100644 --- a/gnome-session.spec +++ b/gnome-session.spec @@ -125,7 +125,7 @@ translation-update-upstream make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install # install startup script and xsession file install -d -m755 %{buildroot}%{_bindir} install -m755 %{SOURCE1} %{buildroot}%{_bindir}/gnome @@ -157,7 +157,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ --remove default-xsession.desktop %{_datadir}/xsessions/gnome.desktop %files -%defattr (-, root, root) %{_bindir}/gnome %{_datadir}/xsessions/default.desktop %{_datadir}/xsessions/gnome.desktop @@ -165,7 +164,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %ghost %{_sysconfdir}/alternatives/default-xsession.desktop %files default-session -%defattr (-, root, root) %{_datadir}/gnome-session/sessions/gnome.session %{_datadir}/gnome-session/sessions/gnome-dummy.session @@ -179,7 +177,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ --remove default-waylandsession.desktop %{_datadir}/wayland-sessions/gnome.desktop %files wayland -%defattr (-, root, root) %dir %{_datadir}/wayland-sessions %{_datadir}/wayland-sessions/default.desktop %{_datadir}/wayland-sessions/gnome.desktop @@ -189,8 +186,8 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %endif %files core -%defattr (-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README +%license COPYING +%doc AUTHORS ChangeLog NEWS README %{_bindir}/gnome-session %{_bindir}/gnome-session-inhibit %{_bindir}/gnome-session-quit @@ -210,6 +207,5 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_ %{_datadir}/gnome-session/hardware-compatibility %files lang -f %{name}-3.0.lang -%defattr(-,root,root) %changelog