[gdm/rhel-7.9: 5/51] Revert "data: Add gnome-login.session"

[Ray Strode <halfline src gnome org>]

commit a4e56e9a3b6404c8649e8f2e22e5b1981097a0cb
Author: Ray Strode <rstrode redhat com>
Date:   Fri Oct 13 13:56:22 2017 -0400

    Revert "data: Add gnome-login.session"
    
    This reverts commit 1073f0e792d9d5bf9d53bddb6e51177c8024c2b3.

 data/Makefile.am                         | 12 ------------
 data/dconf/defaults/00-upstream-settings |  2 +-
 data/gnome-login.session.in              |  3 ---
 3 files changed, 1 insertion(+), 16 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index a47e7900f..f69ec12dc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -83,20 +83,9 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
                -e 's,[@]sbindir[@],$(sbindir),g' \
                <$(srcdir)/gdm.schemas.in.in >gdm.schemas.in
 
-
-EXTRA_DIST += gnome-login.session.in
-
-gnome-login.session: $(srcdir)/gnome-login.session.in
-       sed     -e 's,[@]libexecdir[@],$(libexecdir),g' \
-               -e 's,[@]CHECK_ACCELERATED_DIR[@],$(CHECK_ACCELERATED_DIR),g' \
-               < $< > $@.tmp && mv $@.tmp $@
-
 localealiasdir = $(datadir)/gdm
 localealias_DATA = locale.alias
 
-sessiondir = $(datadir)/gnome-session/sessions
-session_DATA =  gnome-login.session
-
 pam_redhat_files = \
        pam-redhat/gdm-autologin.pam            \
        pam-redhat/gdm-launch-environment.pam   \
@@ -191,7 +180,6 @@ CLEANFILES =                                \
 DISTCLEANFILES =                       \
        $(dbusconf_DATA)                \
        gdm.schemas                     \
-       gnome-login.session             \
        $(NULL)
 
 MAINTAINERCLEANFILES =                 \
diff --git a/data/dconf/defaults/00-upstream-settings b/data/dconf/defaults/00-upstream-settings
index 603903e62..f109e0a95 100644
--- a/data/dconf/defaults/00-upstream-settings
+++ b/data/dconf/defaults/00-upstream-settings
@@ -7,7 +7,7 @@
 #
 
 [org/gnome/desktop/session]
-session-name='gnome-login'
+session-name='gnome'
 
 [org/gnome/desktop/a11y]
 always-show-universal-access-status=true