--- a/ChangeLog	Fri May 12 03:36:31 2006 +0000
+++ b/ChangeLog	Fri May 12 07:12:40 2006 +0000
@@ -1,3 +1,10 @@
+2006-05-12  Brian Cameron  <[email protected]>
+
+	* gdm.spec, patches/gdm-09-startagain.diff,
+	  patches/gdm-10-linguas.diff:  Update to gdm 2.14.6 and add patch to
+	  add the startagain label used by the Nimbus theme, and a patch to
+	  improve the language dialog provided by Peter Nugent.
+
 2006-05-12  Glynn Foster  <[email protected]>
 
 	* patches/nautilus-10-context-menu.diff: Update to follow the 

--- a/Solaris/ChangeLog	Fri May 12 03:36:31 2006 +0000
+++ b/Solaris/ChangeLog	Fri May 12 07:12:40 2006 +0000
@@ -1,3 +1,8 @@
+2006-05-12  Brian Cameron  <[email protected]>
+
+	* SUNWgnome-display-mgr.spec: Add SUNWgnome-dialog as a Required
+	  dependency, since GDM does use zenity.
+
 2006-05-12  Glynn Foster  <[email protected]>
 
 	* SUNWgnome-session.spec: Add dummy location for the autostart

--- a/Solaris/SUNWgnome-display-mgr.spec	Fri May 12 03:36:31 2006 +0000
+++ b/Solaris/SUNWgnome-display-mgr.spec	Fri May 12 07:12:40 2006 +0000
@@ -47,6 +47,7 @@
 Requires: SUNWgnome-base-libs
 Requires: SUNWgnome-libs
 Requires: SUNWgnome-display-mgr-root
+Requires: SUNWgnome-dialog
 Requires: SUNWgnome-dtlogin-integration
 Requires: SUNWlibrsvg
 Requires: SUNWlxml
@@ -221,9 +222,11 @@
 %endif
 
 %changelog
+* Fri May 12 2006 - [email protected]
+- Add SUNWgnome-dialog as a dependency since GDM does use zenity in places.
 * Thu May 11 2006 - [email protected]
 - Added %post scripting to migrate users from the old SMF service name
-  to the new one.
+  to the new one.  
 * Wed May 10 2006 - [email protected]
 - merge -share pkg(s) into the base pkg(s)
 * Tue May 09 2006 - [email protected]

--- a/gdm.spec	Fri May 12 03:36:31 2006 +0000
+++ b/gdm.spec	Fri May 12 07:12:40 2006 +0000
@@ -8,12 +8,12 @@
 Name:         gdm
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.14.5
+Version:      2.14.6
 Release:      2
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
 Summary:      The GNOME 2.x Display Manager
-Source:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.14/gdm-%{version}.tar.bz2
+Source:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.14/gdm-%{version}.tar.gz
 Source1:      gdm-stop.1m.gz
 Source2:      gdmconfig.1m.gz
 Source3:      gdm-binary.1.gz
@@ -41,7 +41,8 @@
 Patch6:       gdm-06-current-locale.diff
 Patch7:       gdm-07-system-locale.diff
 Patch8:       gdm-08-avoidchown.diff
-Patch9:       gdm-09-coolstartsunray.diff
+Patch9:       gdm-09-startagain.diff
+Patch10:      gdm-10-linguas.diff
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:       %{_defaultdocdir}
@@ -112,7 +113,8 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-#%patch9 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 %ifos linux
@@ -238,6 +240,13 @@
 %config /etc/security/*
 
 %changelog
+* Fri May 12 2006 - [email protected]
+- Updated to 2.14.6 which has the new features included in the patch
+  added in the previous comment.  Replace the patch with a much smaller
+  patch that just adds the "startagain" feature.  This is much more
+  maintainable.  Also added a patch to update the Lanugage display
+  provided by Peter Nugent.
+
 * Thu May 11 2006 - [email protected]
 - Add patch to add per-display configuration needed by SunRay.
   This patch also adds the updated Cancel button, the pam-error-logo,

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-09-startagain.diff	Fri May 12 07:12:40 2006 +0000
@@ -0,0 +1,21 @@
+--- gdm-2.14.6/gui/greeter/greeter_parser.c-orig	2006-05-12 02:00:28.533677000 -0500
++++ gdm-2.14.6/gui/greeter/greeter_parser.c	2006-05-12 02:00:51.056897000 -0500
+@@ -1102,12 +1102,16 @@ parse_stock (xmlNodePtr node,
+        * Support startagain as cancel for forward compatibility without
+        * string breakage.
+        */
+-      else if (g_ascii_strcasecmp ((char *) prop, "cancel") == 0 ||
+-               g_ascii_strcasecmp ((char *) prop, "startagain") == 0)
++      else if (g_ascii_strcasecmp ((char *) prop, "cancel") == 0)
+         {
+ 	  g_free (*translated_text);
+ 	  *translated_text = g_strdup (_("_Cancel"));
+ 	}
++      else if (g_ascii_strcasecmp ((char *) prop, "startagain") == 0)
++        {
++          g_free (*translated_text);
++          *translated_text = g_strdup (_("_Start Again"));
++        }
+       else
+         {
+           g_set_error (error,

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gdm-10-linguas.diff	Fri May 12 07:12:40 2006 +0000
@@ -0,0 +1,115 @@
+Index: gdm/config/locale.alias
+===================================================================
+RCS file: /cvs/gnome/gdm2/config/locale.alias,v
+retrieving revision 1.45
+diff -r1.45 locale.alias
+16a17
+> C(POSIX)   C,POSIX
+21a23
+> Arabic(SaudiArabia)		ar_SA.UTF-8,ar_SA
+33a36
+> Chinese(GB18030)	zh_CN.GB18030
+41c44
+< English(USA)		en_US.UTF-8,en_US
+---
+> Dutch(Belgium)			nl_BE.UTF-8,nl_BE
+43d45
+< English(UK)		en_GB.UTF-8,en_GB
+45a48,49
+> English(Malta)	en_MT.UTF-8,en_MT
+> English(NewZealand)	en_NZ.UTF-8,en_NZ
+46a51,52
+> English(UK)		en_GB.UTF-8,en_GB
+> English(USA)		en_US.UTF-8,en_US
+51a58,59
+> French(Canada)		fr_CA.UTF-8,fr_CA
+> French(Luxembourg)		fr_LU.UTF-8,fr_LU
+56a65
+> German(Luxembourg)	de_LU.UTF-8,de_LU
+57a67
+> Greek(Cyprus)			el_CY.UTF-8,el_CY
+78a89
+> Maltese			mt_MT.UTF-8,mt_MT
+94a106
+> Serbian(Bosnia)			sh_BA.UTF-8,sh_BA
+99a112,118
+> Spanish(Argentina)		es_AR.UTF-8,es_AR
+> Spanish(Bolivia)		es_BO.UTF-8,es_BO
+> Spanish(Chile)		es_CL.UTF-8,es_CL
+> Spanish(Colombia)		es_CO.UTF-8,es_CO
+> Spanish(CostaRica)		es_CR.UTF-8,es_CR
+> Spanish(Ecuador)		es_EC.UTF-8,es_EC
+> Spanish(Guatemala)		es_GT.UTF-8,es_GT
+100a120,126
+> Spanish(Nicaragua)		es_NI.UTF-8,es_NI
+> Spanish(Panama)		es_PA.UTF-8,es_PA
+> Spanish(Peru)		es_PE.UTF-8,es_PE
+> Spanish(Paraguay)		es_PY.UTF-8,es_PY
+> Spanish(ElSalvador)		es_SV.UTF-8,es_SV
+> Spanish(Uruguay)		es_UY.UTF-8,es_UY
+> Spanish(Venezuela)		es_VE.UTF-8,es_VE
+Index: gdm/gui/gdmlanguages.c
+===================================================================
+RCS file: /cvs/gnome/gdm2/gui/gdmlanguages.c,v
+retrieving revision 1.58
+diff -r1.58 gdmlanguages.c
+62a63,64
+> 	{ N_("A-M|Arabic (Saudi Arabia)"), "ar_SA", NULL, 0 },
+> 	/*Note translate the A-M to the A-M you used in the group label */
+96a99,100
+> 	{ N_("A-M|Dutch (Belgium)"), "nl_BE", "Nederlands (België)", 0 },
+> 	/*Note translate the A-M to the A-M you used in the group label */
+110a115,118
+> 	{ N_("A-M|English (Malta)"), "en_MT", "Maltese English", 0 },
+> 	/*Note translate the A-M to the A-M you used in the group label */
+> 	{ N_("A-M|English (New Zealand)"), "en_NZ", "New Zealand English", 0 },
+> 	/*Note translate the A-M to the A-M you used in the group label */
+118a127,130
+> 	{ N_("A-M|French (Canada)"), "fr_CA", "Français (Canada)", 0 },
+> 	/*Note translate the A-M to the A-M you used in the group label */
+> 	{ N_("A-M|French (Luxembourg)"), "fr_LU", "Français (Luxembourg)", 0 },
+> 	/*Note translate the A-M to the A-M you used in the group label */
+126a139,140
+> 	{ N_("A-M|German (Luxembourg)"), "de_LU", "Deutsch (Luxemburg)", 0 },
+> 	/*Note translate the A-M to the A-M you used in the group label */
+130a145,146
+> 	{ N_("A-M|Greek (Cyprus)"), "el_CY", "Ελληνικά (Κύπρος)", 0 },
+> 	/*Note translate the A-M to the A-M you used in the group label */
+168a185,186
+>         { N_("A-M|Maltese"), "mt_MT", NULL, 0 },
+>         /*Note translate the A-M to the A-M you used in the group label */
+202a221,222
+> 	{ N_("N-Z|Serbian (Bosnia)"), "sh_BA", "srpski (Bosna i Hercegovina)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+209c229,257
+< 	{ N_("N-Z|Spanish (Mexico)"), "es_MX", "Español (Mexico)", 0 },
+---
+> 	{ N_("N-Z|Spanish (Argentina)"), "es_AR", "Español (Argentina)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (Bolivia)"), "es_BO", "Español (Bolivia)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (Chile)"), "es_CL", "Español (Chile)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (Colombia)"), "es_CO", "Español (Colombia)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (Costa Rica)"), "es_CR", "Español (Costa Rica)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (Ecuador)"), "es_EC", "Español (Ecuador)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (Guatemala)"), "es_GT", "Español (Guatemala)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (Mexico)"), "es_MX", "Español (México)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (Nicaragua)"), "es_NI", "Español (Nicaragua)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (Panama)"), "es_PA", "Español (Panamá)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (Peru)"), "es_PE", "Español (Perú)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (Paraguay)"), "es_PY", "Español (Paraguay)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (El Salvador)"), "es_SV", "Español (El Salvador)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (Uruguay)"), "es_UY", "Español (Uruguay)", 0 },
+> 	/*Note translate the N-Z to the N-Z you used in the group label */
+> 	{ N_("N-Z|Spanish (Venezuela)"), "es_VE", "Español (Venezuela)", 0 },