diff --git a/gdm-should-recover-automatically.patch b/gdm-should-recover-automatically.patch deleted file mode 100644 index 5d80df08862ac62b65d05e94f53520dead87f61b..0000000000000000000000000000000000000000 --- a/gdm-should-recover-automatically.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- gdm-42.0/data/gdm.service.in.orig 2022-04-01 14:42:08.314733966 +0800 -+++ gdm-42.0/data/gdm.service.in 2022-04-01 14:42:20.537474205 +0800 -@@ -20,6 +20,7 @@ After=rc-local.service plymouth-start.se - OnFailure=plymouth-quit.service - - [Service] -+ExecStartPre=/bin/sh -c "systemctl stop session-c*.scope" - ExecStart=${sbindir}/gdm - KillMode=mixed - Restart=always diff --git a/gdm.spec b/gdm.spec index 40cc05069f9bb846aaa46bd675f1206c4dd7edf3..ce618f3e502d0c113bec62715000f1fd1abef337 100644 --- a/gdm.spec +++ b/gdm.spec @@ -7,7 +7,7 @@ Name: gdm Epoch: 1 Version: 42.0 -Release: 2 +Release: 3 Summary: A graphical display manager License: GPLv2+ URL: https://wiki.gnome.org/Projects/GDM @@ -17,8 +17,7 @@ Source5: default.pa-for-gdm Patch0: 0001-data-add-system-dconf-databases-to-gdm-profile.patch Patch1: 0001-Honor-initial-setup-being-disabled-by-distro-install.patch -Patch2: gdm-should-recover-automatically.patch -Patch3: 9000-add-openeuler-pam-config.patch +Patch2: 9000-add-openeuler-pam-config.patch BuildRequires: meson automake autoconf systemd dconf itstool libtool which BuildRequires: systemd-devel libselinux-devel libattr-devel gettext-devel @@ -236,6 +235,9 @@ fi %{_libdir}/pkgconfig/gdm-pam-extensions.pc %changelog +* Mon Apr 24 2023 wangyoukang - 1:42.0-3 +- fix gdm.service may kill user service during startup + * Mon Aug 1 2022 caodongxia - 1:42.0-2 - The installation dependency pam is added to solve the gdm.servic startup problem