Accepting request 964272 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/964272
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-session?expand=0&rev=201

gnome-session-41.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ee4a229053f522624054889609335b885287cf67bbde0dc9fd882b01ec9b5b39
-size 483396

gnome-session-42.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3cca06053ab682926920951a7da95f8cc6d72da74c682c46d0a0653332969caa
+size 485616

gnome-session-better-handle-empty-xdg_session_type.patch

@@ -1,13 +1,13 @@
-Index: gnome-session-41.3/tools/gnome-session-check-accelerated.c
+Index: gnome-session-42.0/tools/gnome-session-check-accelerated.c
 ===================================================================
---- gnome-session-41.3.orig/tools/gnome-session-check-accelerated.c
+--- gnome-session-42.0.orig/tools/gnome-session-check-accelerated.c
-+++ gnome-session-41.3/tools/gnome-session-check-accelerated.c
++++ gnome-session-42.0/tools/gnome-session-check-accelerated.c
 @@ -147,7 +147,7 @@ main (int argc, char **argv)
           * Also make sure that we don't read cached information about the first GPU
           * when requesting information about the second.
           */
 -        if (is_discrete_gpu_check () || g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "x11") != 0) {
 +        if (is_discrete_gpu_check () || g_strcmp0 (g_getenv ("XDG_SESSION_TYPE"), "wayland") == 0) {
-                 g_autofree char *discrete_renderer_string = get_gtk_gles_renderer ();
+                 g_autofree char *discrete_renderer_string = get_gtk_gles_renderer (&gtk_gles_error);
                  if (discrete_renderer_string) {
                          g_print ("%s", discrete_renderer_string);

gnome-session.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Mar 23 09:56:57 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 42.0:
+  + Give better error when failing to get renderer string.
+  + Fix failure to run sessions for program accounts.
+  + Updated translations.
+- Rebase gnome-session-better-handle-empty-xdg_session_type.patch
+  with quilt.
+- Drop glib2_gsettings_schema_requires macro from
+  gnome-session-core package, no longer needed.
+- Add a basever define and set it to 42, make future version
+  updates simpler, as this will autorename lang-package with
+  regards to version (as done here, bumped to 42 from 41).
+
 -------------------------------------------------------------------
 Mon Feb 21 02:19:03 UTC 2022 - Xiaoguang Wang <xiaoguang.wang@suse.com>
 

gnome-session.spec

@@ -16,14 +16,16 @@
 #
 
 
+%define basever 42
+
 Name:           gnome-session
-Version:        41.3
+Version:        42.0
 Release:        0
 Summary:        Session Tools for the GNOME Desktop
 License:        GPL-2.0-or-later
 Group:          System/GUI/GNOME
 URL:            https://www.gnome.org
-Source0:        https://download.gnome.org/sources/gnome-session/41/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gnome-session/%{basever}/%{name}-%{version}.tar.xz
 Source1:        gnome
 Source2:        gnome.desktop
 # PATCH-FIX-UPSTREAM gnome-session-better-handle-empty-xdg_session_type.patch bsc#1084756 bgo#794256 yfjiang@suse.com -- solution provided by msrb@suse.com using a more reasonable way to handle gpu acceleration check
@@ -94,7 +96,6 @@ Group:          System/GUI/GNOME
 Requires:       dbus-1-x11
 Requires:       gsettings-desktop-schemas >= 0.1.7
 Requires:       hicolor-icon-theme
-%glib2_gsettings_schema_requires
 
 %description core
 This package contains a minimal version of gnome-session, that can be
@@ -126,7 +127,7 @@ install -d -m755 %{buildroot}%{_bindir}
 install -m755 %{SOURCE1} %{buildroot}%{_bindir}/gnome
 install -d -m755 %{buildroot}%{_datadir}/xsessions
 install -m644 %{SOURCE2} %{buildroot}%{_datadir}/xsessions/gnome.desktop
-%find_lang %{name}-41 %{?no_lang_C}
+%find_lang %{name}-%{basever} %{?no_lang_C}
 %fdupes %{buildroot}/%{_prefix}
 # remove wayland files on s390/s390x
 %ifarch s390 s390x
@@ -225,6 +226,6 @@ ln -s %{_sysconfdir}/alternatives/default-waylandsession.desktop %{buildroot}%{_
 %dir %{_userunitdir}/gnome-session@gnome.target.d
 %{_userunitdir}/gnome-session@gnome.target.d/gnome.session.conf
 
-%files lang -f %{name}-41.lang
+%files lang -f %{name}-%{basever}.lang
 
 %changelog