Sync from SUSE:SLFO:Main gnome-session revision dd908570affe45cc227a57a5ddcc547e
This commit is contained in:
parent
e871239320
commit
7e1d0b2300
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 27 16:55:31 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Build gnome-session-wayland also on s390x: It was originally
|
||||
excluded because xwayland did not exist. That has been solved in
|
||||
2021 though.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 13 08:00:01 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Move update-alternative post/postun scriptlets from the main
|
||||
package to the xsession sub-package (boo#1233299).
|
||||
- Drop gnome-session-default-session: this was there to also
|
||||
support the alternative fallback-session, but that one was
|
||||
dropped at the times of GNOME 3.8.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 30 07:54:32 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
- Split out new sub-package gnome-session-xsession.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 19 13:28:13 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||
|
||||
|
@ -57,27 +57,15 @@ BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: pkgconfig(xcomposite)
|
||||
BuildRequires: pkgconfig(xtrans)
|
||||
Requires: %{name}-core = %{version}
|
||||
Requires: %{name}-default-session = %{version}
|
||||
# gnome-session-wayland not recommended by default yet: causes various issues:
|
||||
# qemu's default video mode is 'cirrus', which stays black with GNOME Wayland
|
||||
# YaST cannot be started without additional tricks
|
||||
# All together this blocks us from passing openQA
|
||||
# Recommends: %%{name}-wayland
|
||||
# gnome-session-default-session merged into gnome-session; the alternative - fallback-session - disappeared
|
||||
# with GNOME 3.8
|
||||
Provides: %{name}-default-session = %{version}
|
||||
Obsoletes: %{name}-default-session <= %{version}
|
||||
|
||||
%description
|
||||
This package provides the basic session tools, like session management
|
||||
functionality, for the GNOME Desktop.
|
||||
|
||||
%package default-session
|
||||
Summary: Default session support for the GNOME Session Manager
|
||||
Group: System/GUI/GNOME
|
||||
Requires: %{name} = %{version}
|
||||
Requires: gnome-settings-daemon
|
||||
Requires: gnome-shell
|
||||
|
||||
%description default-session
|
||||
This package contains the definition of the default GNOME session.
|
||||
|
||||
%package wayland
|
||||
Summary: Wayland support for the GNOME Session Manager
|
||||
Group: System/GUI/GNOME
|
||||
@ -100,6 +88,16 @@ This package contains a minimal version of gnome-session, that can be
|
||||
used for specific cases. The gnome-session package is needed for a fully
|
||||
functional GNOME desktop.
|
||||
|
||||
%package xsession
|
||||
Summary: Desktop file for X11 GNOME Session
|
||||
Provides: gnome-session:%{_datadir}/xsessions/gnome.desktop
|
||||
Requires: %{name} = %{version}
|
||||
Requires: gnome-shell
|
||||
Requires: xorg-x11-server
|
||||
|
||||
%description xsession
|
||||
Desktop file to add GNOME (X11) to display manager session menu.
|
||||
|
||||
%lang_package
|
||||
|
||||
%prep
|
||||
@ -125,40 +123,33 @@ install -d -m755 %{buildroot}%{_datadir}/xsessions
|
||||
install -m644 %{SOURCE2} %{buildroot}%{_datadir}/xsessions/gnome.desktop
|
||||
%find_lang %{name}-%{basever} %{?no_lang_C}
|
||||
%fdupes %{buildroot}/%{_prefix}
|
||||
# remove wayland files on s390/s390x
|
||||
%ifarch s390 s390x
|
||||
rm -fr %{buildroot}%{_datadir}/wayland-sessions
|
||||
%endif
|
||||
|
||||
# Prepare for 'default.desktop' being update-alternative handled, boo#1039756
|
||||
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
|
||||
%post xsession
|
||||
%{_sbindir}/update-alternatives --install %{_datadir}/xsessions/default.desktop \
|
||||
default-xsession.desktop %{_datadir}/xsessions/gnome.desktop 25
|
||||
|
||||
%postun
|
||||
%postun xsession
|
||||
[ -f %{_datadir}/xsessions/gnome.desktop ] || %{_sbindir}/update-alternatives \
|
||||
--remove default-xsession.desktop %{_datadir}/xsessions/gnome.desktop
|
||||
|
||||
%files
|
||||
%{_bindir}/gnome
|
||||
%{_datadir}/gnome-session/sessions/gnome.session
|
||||
%{_datadir}/gnome-session/sessions/gnome-dummy.session
|
||||
|
||||
%files xsession
|
||||
%{_datadir}/xsessions/default.desktop
|
||||
%{_datadir}/xsessions/gnome.desktop
|
||||
%{_datadir}/xsessions/gnome-xorg.desktop
|
||||
%ghost %{_sysconfdir}/alternatives/default-xsession.desktop
|
||||
|
||||
%files default-session
|
||||
%{_datadir}/gnome-session/sessions/gnome.session
|
||||
%{_datadir}/gnome-session/sessions/gnome-dummy.session
|
||||
|
||||
%ifnarch s390 s390x
|
||||
%post wayland
|
||||
%{_sbindir}/update-alternatives --install %{_datadir}/wayland-sessions/default.desktop \
|
||||
default-waylandsession.desktop %{_datadir}/wayland-sessions/gnome.desktop 25
|
||||
@ -175,7 +166,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
|
||||
%ghost %{_sysconfdir}/alternatives/default-waylandsession.desktop
|
||||
# Disabled as wayland is now the default session again.
|
||||
#{_datadir}/wayland-sessions/gnome-wayland.desktop
|
||||
%endif
|
||||
|
||||
%files core
|
||||
%license COPYING
|
||||
|
Loading…
x
Reference in New Issue
Block a user