diff --git a/gdm-2.20.0-wait-for-restart.patch b/gdm-2.20.0-wait-for-restart.patch new file mode 100644 index 0000000..0d48f27 --- /dev/null +++ b/gdm-2.20.0-wait-for-restart.patch @@ -0,0 +1,21 @@ +diff -upr gdm-2.20.0-pre/daemon/gdm.c gdm-2.20.0-post/daemon/gdm.c +--- gdm-2.20.0-pre/daemon/gdm.c 2007-09-21 15:48:23.000000000 -0500 ++++ gdm-2.20.0-post/daemon/gdm.c 2007-09-21 16:25:47.000000000 -0500 +@@ -715,7 +715,7 @@ halt_machine (void) + #ifdef __linux__ + change_to_first_and_clear (FALSE); + #endif /* __linux */ +- ++ sleep (20); + } + } + +@@ -735,7 +735,7 @@ restart_machine (void) + #ifdef __linux__ + change_to_first_and_clear (TRUE); + #endif /* __linux */ +- ++ sleep (20); + } + } + diff --git a/gdm.changes b/gdm.changes index f367653..11e3fb4 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 24 03:14:42 CEST 2007 - hpj@suse.de + +- Added gdm-2.20.0-wait-for-restart.patch, which fixes Novell bug + #326281. + ------------------------------------------------------------------- Thu Sep 20 20:01:48 CEST 2007 - banderso@suse.de diff --git a/gdm.spec b/gdm.spec index 1c6c81c..c07756a 100644 --- a/gdm.spec +++ b/gdm.spec @@ -22,7 +22,7 @@ PreReq: %insserv_prereq License: GPL v2 or later Group: System/GUI/GNOME Version: 2.20.0 -Release: 2 +Release: 6 Summary: The GNOME 2.x Display Manager Source: %{name}-%{version}.tar.bz2 Source1: gdm.pamd @@ -57,6 +57,7 @@ Patch40: gdm-XKeepsCrashing-SaX2.patch #Patch42: fix-desktop-files.diff Patch43: gdm-language-hang.patch Patch44: gdm-language-save.patch +Patch45: gdm-2.20.0-wait-for-restart.patch Url: http://www.gnome.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build DocDir: %{_defaultdocdir} @@ -114,6 +115,7 @@ gnome-patch-translation-prepare #%patch42 - dont think this patch is needed with suse_udpate_desktop_file -g working. %patch43 %patch44 +%patch45 -p1 gnome-patch-translation-update %build @@ -246,6 +248,9 @@ sed -i s:DISPLAYMANAGER=/opt/gnome/sbin/gdm:DISPLAYMANAGER=/usr/sbin/gdm:g etc/i %files lang -f %{name}.lang %changelog +* Mon Sep 24 2007 - hpj@suse.de +- Added gdm-2.20.0-wait-for-restart.patch, which fixes Novell bug + [#326281]. * Thu Sep 20 2007 - banderso@suse.de - added gdm-language-save.patch. Patch fixes a problem where the .dmrc file was not getting created in the process of saving the