_service

@@ -3,7 +3,7 @@
   <service name="obs_scm" mode="manual">
     <param name="scm">git</param>
     <param name="url">https://gitlab.gnome.org/GNOME/gdm.git</param>
-    <param name="revision">47.0</param>
+    <param name="revision">46.2</param>
     <param name="versionformat">@PARENT_TAG@+@TAG_OFFSET@</param>
     <param name="versionrewrite-pattern">(.*)\+0</param>
     <param name="versionrewrite-replacement">\1</param>

gdm-46.2.obscpio

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

gdm-default-wm.patch

@@ -0,0 +1,28 @@
+Index: gdm-46.rc/daemon/gdm-session.c
+===================================================================
+--- gdm-46.rc.orig/daemon/gdm-session.c
++++ gdm-46.rc/daemon/gdm-session.c
+@@ -47,6 +47,8 @@
+ 
+ #include <systemd/sd-login.h>
+ 
++#include "gdm-sysconfig.h"
++
+ #include "gdm-session.h"
+ #include "gdm-session-glue.h"
+ #include "gdm-dbus-util.h"
+@@ -618,6 +620,14 @@ get_fallback_session_name (GdmSession *s
+                 }
+         }
+ 
++        name = gdm_sysconfig_load_value ("/etc/sysconfig/windowmanager", "DEFAULT_WM");
++        if (name && get_session_command_for_name (self, name, NULL, NULL)) {
++                g_free (self->fallback_session_name);
++                self->fallback_session_name = name;
++                goto out;
++        }
++        g_free (name);
++
+         name = g_strdup ("gnome");
+         if (get_session_command_for_name (self, name, NULL, NULL)) {
+                 g_free (self->fallback_session_name);

gdm.changes

@@ -1,39 +1,3 @@
--------------------------------------------------------------------
-Mon Sep 16 13:49:56 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Update to version 47.0:
-  + Fix X11 support.
-
--------------------------------------------------------------------
-Thu Sep 12 13:32:14 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Split the xdm-wrapper parts into gdm-xdm-integration. Require
-  this new package or gdm-systemd by gdm (suggesting the
-  xdm-integration for now).
-
--------------------------------------------------------------------
-Wed Sep 11 17:43:19 UTC 2024 - Bjørn Lie <bjorn.lie@gmail.com>
-
-- Update to version 47.rc:
-  + Make X11 support optional
-  + Support logind secure attention key
-  + Drop gdm-screenshot
-  + Don't hardcode g-r-d in dbus policy
-  + Fix numeric local address resolution
-  + Docs updates
-  + Updated translations.
-- Changes from version 47.alpha:
-  + Support for gnome-remote-desktop persistent sessions
-  + Misc changes
-  + Updated translations.
-- Drop pkgconfig(libcanberra-gtk3) BuildRequires: No longer needed,
-  nor used.
-
--------------------------------------------------------------------
-Thu Aug 15 09:41:11 UTC 2024 - Alynx Zhou <alynx.zhou@suse.com>
-
-- Add pam_pkcs11 as Recommends for smartcard login (bsc#1223580).
-
 -------------------------------------------------------------------
 Mon Aug 12 17:34:38 UTC 2024 - Michael Gorse <mgorse@suse.com>
 

gdm.obsinfo

@@ -1,4 +1,4 @@
 name: gdm
-version: 47.0
+version: 46.2
-mtime: 1726493306
+mtime: 1716997827
-commit: 9c78ff6d02195156a5b556eb2a6395d7ae3d6910
+commit: fe66f25999e329212193559972fb23dd096889f2

gdm.spec

@@ -27,7 +27,7 @@
 %endif
 
 Name:           gdm
-Version:        47.0
+Version:        46.2
 Release:        0
 Summary:        The GNOME Display Manager
 License:        GPL-2.0-or-later
@@ -111,6 +111,7 @@ BuildRequires:  pkgconfig(gtk+-3.0) >= 2.91.1
 BuildRequires:  pkgconfig(gudev-1.0) >= 232
 BuildRequires:  pkgconfig(iso-codes)
 BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(libcanberra-gtk3) >= 0.4
 BuildRequires:  pkgconfig(libkeyutils)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(ply-boot-client)
@@ -129,15 +130,14 @@ Requires:       gnome-settings-daemon
 Requires:       gnome-shell
 # xdm package ships systemd display-manager service and other common scripts
 # between display managers (bsc#1084655)
-Requires:       (gdm-xdm-integration or gdm-systemd)
+Requires:       xdm
-Suggests:       gdm-xdm-integration
 Requires(post): dconf
 Requires(pre):  group(video)
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
 Recommends:     iso-codes
 # accessibility
 Recommends:     orca
-# smartcard login
-Recommends:     pam_pkcs11
 Provides:       gdm2 = %{version}
 Obsoletes:      gdm2 < %{version}
 Provides:       gnome-applets-gdm = %{version}
@@ -212,17 +212,6 @@ providing graphical log-ins and managing local and remote displays.
 
 This package provides the upstream default configuration for gdm.
 
-%package xdm-integration
-Summary:        gdm integration into the xdm wrapper script
-Requires:       gdm
-Requires:       xdm
-Requires(post): update-alternatives
-Requires(postun): update-alternatives
-
-%description xdm-integration
-GDM's XDM wrapper integration
-By default openSUSE uses xdm which enables the DM based on sysconfig.
-
 %package systemd
 Summary:        Systemd gdm.service file
 Group:          System/GUI/GNOME
@@ -371,8 +360,6 @@ install -D -m 644 %{SOURCE20} %{buildroot}%{_prefix}/share/factory/var/lib/gdm/.
 
 %post
 %tmpfiles_create gdm.conf
-
-%post xdm-integration
 %{_sbindir}/update-alternatives --install %{_prefix}/lib/X11/displaymanagers/default-displaymanager \
   default-displaymanager %{_prefix}/lib/X11/displaymanagers/gdm 25
 
@@ -380,7 +367,7 @@ install -D -m 644 %{SOURCE20} %{buildroot}%{_prefix}/share/factory/var/lib/gdm/.
 # Create dconf database for gdm, to lockdown the gdm session
 dconf update
 
-%postun xdm-integration
+%postun
 [ -f %{_prefix}/lib/X11/displaymanagers/gdm ] || %{_sbindir}/update-alternatives \
   --remove default-displaymanager %{_prefix}/lib/X11/displaymanagers/gdm
 
@@ -396,6 +383,7 @@ dconf update
 %{_sbindir}/gdm
 %{_bindir}/gdm
 %{_bindir}/gdm-config
+%{_bindir}/gdm-screenshot
 %dir %{_datadir}/dconf
 %dir %{_datadir}/dconf/profile
 %{_datadir}/dconf/profile/gdm
@@ -423,6 +411,11 @@ dconf update
 %_config_norepl %{_pam_vendordir}/gdm-password
 %_config_norepl %{_pam_vendordir}/gdm-launch-environment
 %{_datadir}/dbus-1/system.d/gdm.conf
+# /etc/xinit.d/xdm integration
+%dir %{_prefix}/lib/X11/displaymanagers
+%{_prefix}/lib/X11/displaymanagers/default-displaymanager
+%{_prefix}/lib/X11/displaymanagers/gdm
+%ghost %{_sysconfdir}/alternatives/default-displaymanager
 %{_udevrulesdir}/61-gdm.rules
 %{_tmpfilesdir}/gdm.conf
 %{_sysusersdir}/gdm.conf
@@ -431,13 +424,6 @@ dconf update
 %dir %{_userunitdir}/gnome-session@gnome-login.target.d
 %{_userunitdir}/gnome-session@gnome-login.target.d/session.conf
 
-%files xdm-integration
-# /etc/xinit.d/xdm integration
-%dir %{_prefix}/lib/X11/displaymanagers
-%{_prefix}/lib/X11/displaymanagers/default-displaymanager
-%{_prefix}/lib/X11/displaymanagers/gdm
-%ghost %{_sysconfdir}/alternatives/default-displaymanager
-
 %files -n libgdm1
 %{_libdir}/libgdm.so.*