--- a/ChangeLog	Mon Jun 04 09:51:00 2007 +0000
+++ b/ChangeLog	Mon Jun 04 11:06:06 2007 +0000
@@ -1,3 +1,9 @@
+2007-06-04  Brian Cameron  <[email protected]>
+
+	* base-libs/gdm.spec: Bump to 2.19.2
+	* patches/gdm-01-branding.diff: Rework
+	* patches/gdm-02-no-gdm-in-cde-menu.diff: Remove upstream-patch.
+
 2007-06-04  Takao Fujiwara  <[email protected]>
 
 	* SUNWgnome-help-viewer.spec:

--- a/base-specs/gdm.spec	Mon Jun 04 09:51:00 2007 +0000
+++ b/base-specs/gdm.spec	Mon Jun 04 11:06:06 2007 +0000
@@ -11,7 +11,7 @@
 Name:         gdm
 License:      GPL
 Group:        System/GUI/GNOME
-Version:      2.19.1
+Version:      2.19.2
 Release:      11
 Distribution: Java Desktop System
 Vendor:       Sun Microsystems, Inc.
@@ -20,11 +20,6 @@
 Source1:      %{name}-po-sun-%{po_sun_version}.tar.bz2
 #owner:yippi date:2004-11-24 type:branding
 Patch1:	      gdm-01-branding.diff
-# This patch is needed to ensure that the GDM menu choices only
-# appear when GDM is actually running.  The GDM programs are non
-# functional in CDE so we don't want them to appear there.
-#owner:yippi date:2007-03-09 type:bug bugster:6530989 bugzilla:434813
-Patch2:       gdm-02-no-gdm-in-cde-menu.diff
 
 URL:          www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -93,7 +88,6 @@
 cd po-sun; make; cd ..
 %endif
 %patch1 -p1
-%patch2 -p1
 
 %build
 %ifos linux
@@ -153,14 +147,6 @@
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gdmflexiserver.desktop
 %endif
 
-# We move the desktop files to /usr/share/gdm/applications and GDM
-# sets XDG_DATA_DIR to include /usr/share/gdm in the related patch.
-# This ensures that GDM related desktop files (gdmflexiserver-xnest,
-# gdmsetup, and gdmphotosetup) only appear if using the GDM login
-# program.
-#
-mv $RPM_BUILD_ROOT%{_datadir}/applications $RPM_BUILD_ROOT%{_datadir}/gdm
-
 # Clean up unpackaged files
 #
 rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.a
@@ -217,6 +203,8 @@
 %config /etc/security/*
 
 %changelog
+* Mon Jun 4 2007 - [email protected]
+- Bump to 2.19.2.  Remove upstream patch gdm-02-no-gdm-in-cde-menu.diff.
 * Thu Jue 1 2007 - [email protected]
 - Point download path to 2.19.
 * Mon May 14 2007 - [email protected]

--- a/patches/gdm-01-branding.diff	Mon Jun 04 09:51:00 2007 +0000
+++ b/patches/gdm-01-branding.diff	Mon Jun 04 11:06:06 2007 +0000
@@ -1,67 +1,3 @@
---- gdm-2.19.0/config/Init.in-orig	2007-05-10 19:17:38.741461000 +0800
-+++ gdm-2.19.0/config/Init.in	2007-05-10 19:16:53.923425000 +0800
-@@ -86,4 +86,10 @@ if [ x$SETXKBMAP != x ] ; then
-   fi
- fi
- 
-+if [ ! -e /etc/jds-registration ]
-+then
-+    java com.sun.jds.Registration
-+    date > /etc/jds-registration
-+fi
-+
- exit 0
---- gdm-2.19.0/gui/gdmsession.c-orig	2007-05-10 19:18:02.549201000 +0800
-+++ gdm-2.19.0/gui/gdmsession.c	2007-05-10 19:16:53.924436000 +0800
-@@ -139,12 +139,15 @@ _gdm_session_list_init (GHashTable **ses
- 
-     if (gdm_config_get_bool (GDM_KEY_SHOW_GNOME_FAILSAFE)) {
- 	session = g_new0 (GdmSession, 1);
--	session->name = g_strdup (_("Failsafe _GNOME"));
--	session->clearname = g_strdup (_("Failsafe GNOME"));
-+	/* SUN_BRANDING */
-+	session->name = g_strdup (_("Failsafe _Java Desktop System"));
-+	/* SUN_BRANDING */
-+	session->clearname = g_strdup (_("Failsafe Java Desktop System"));
-+	/* SUN_BRANDING */
- 	session->comment = g_strdup (_("This is a failsafe session that will log you "
--		"into GNOME. No startup scripts will be read "
-+		"into Java Desktop System. No startup scripts will be read "
- 		"and it is only to be used when you can't log "
--		"in otherwise.  GNOME will use the 'Default' "
-+		"in otherwise.  Java Desktop System will use the 'Default' "
- 		"session."));
- 	g_hash_table_insert (*sessnames, g_strdup (GDM_SESSION_FAILSAFE_GNOME), session);
-     }
-@@ -329,12 +332,15 @@ _gdm_session_list_init (GHashTable **ses
- 
-     if (gdm_config_get_bool (GDM_KEY_SHOW_GNOME_FAILSAFE)) {
- 	    session            = g_new0 (GdmSession, 1);
--	    session->name      = g_strdup (_("Failsafe _GNOME"));
--	    session->clearname = g_strdup (_("Failsafe GNOME"));
-+	    /* SUN_BRANDING */
-+	    session->name      = g_strdup (_("Failsafe _Java Desktop System"));
-+	    /* SUN_BRANDING */
-+	    session->clearname = g_strdup (_("Failsafe Java Desktop System"));
-+	    /* SUN_BRANDING */
- 	    session->comment   = g_strdup (_("This is a failsafe session that will log you "
--				    "into GNOME. No startup scripts will be read "
-+				    "into Java Desktop System. No startup scripts will be read "
-                                     "and it is only to be used when you can't log "
--                                    "in otherwise.  GNOME will use the 'Default' "
-+                                    "in otherwise.  Java Desktop System will use the 'Default' "
- 				    "session."));
- 	    g_hash_table_insert (*sessnames,
- 		g_strdup (GDM_SESSION_FAILSAFE_GNOME), session);
-@@ -363,7 +369,7 @@ _gdm_session_list_init (GHashTable **ses
-     if (default_session != NULL)
- 	    if G_UNLIKELY (*default_session == NULL) {
- 		    *default_session = g_strdup (GDM_SESSION_FAILSAFE_GNOME);
--		    gdm_common_warning ("No default session link found. Using Failsafe GNOME.");
-+		    gdm_common_warning ("No default session link found. Using Failsafe Java Desktop System.");
- 	    }
-     
-     if (current_session != NULL &&
 --- gdm-2.19.0/config/gdm.conf.in-orig	2007-05-10 19:20:33.377139000 +0800
 +++ gdm-2.19.0/config/gdm.conf.in	2007-05-10 19:16:53.995917000 +0800
 @@ -68,7 +68,7 @@ TimedLoginDelay=30
@@ -135,35 +71,6 @@
  GraphicalThemeDir=@datadir@/gdm/themes/
  GraphicalThemeRand=false
  
---- gdm-2.19.0/config/gnome.desktop.in.in-orig	2007-05-10 19:13:35.568847000 +0800
-+++ gdm-2.19.0/config/gnome.desktop.in.in	2007-05-10 19:12:25.722824000 +0800
-@@ -1,7 +1,9 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=GNOME
--_Comment=This session logs you into GNOME
-+# SUN_BRANDING
-+_Name=Java Desktop System
-+# SUN_BRANDING
-+_Comment=This session logs you into the Java Desktop System
- Exec=@GDMGNOMESESSIONCMD@
- TryExec=@GDMGNOMESESSIONCMD@
- # no icon yet, only the top three are currently used
---- gdm-2.19.0/gui/gdmflexiserver-xnest.desktop.in.in-orig	2007-05-10 19:19:14.283145000 +0800
-+++ gdm-2.19.0/gui/gdmflexiserver-xnest.desktop.in.in	2007-05-10 19:19:49.427700000 +0800
-@@ -1,8 +1,9 @@
- [Desktop Entry]
- Encoding=UTF-8
--_Name=New Login in a Nested Window
--_GenericName=New Login in a Nested Window
--_Comment=Login as another user inside a nested window
-+# SUN_BRANDING
-+_Name=New Login in a Window
-+_GenericName=New Login in a Window
-+_Comment=Login as another user in a window
- TryExec=@X_XNEST_CMD@
- Exec=gdmflexiserver --xnest
- Icon=gdm-xnest
 --- gdm-2.19.0/config/Xsession.in-orig	2007-05-11 14:17:11.932010000 +0800
 +++ gdm-2.19.0/config/Xsession.in	2007-05-11 14:17:19.367542000 +0800
 @@ -271,14 +271,6 @@ if [ "x$command" = "xdefault" ] ; then
@@ -181,3 +88,16 @@
  echo "$0: Setup done, will execute: $command"
  
  eval exec $command
+--- gdm-2.19.0/config/Init.in-orig	2007-05-10 19:17:38.741461000 +0800
++++ gdm-2.19.0/config/Init.in	2007-05-10 19:16:53.923425000 +0800
+@@ -86,4 +86,10 @@ if [ x$SETXKBMAP != x ] ; then
+   fi
+ fi
+ 
++if [ ! -e /etc/jds-registration ]
++then
++    java com.sun.jds.Registration
++    date > /etc/jds-registration
++fi
++
+ exit 0

--- a/patches/gdm-02-no-gdm-in-cde-menu.diff	Mon Jun 04 09:51:00 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
---- gdm-2.19.0/daemon/slave.c-orig	2007-05-10 19:29:56.425480000 +0800
-+++ gdm-2.19.0/daemon/slave.c	2007-05-10 19:29:49.390431000 +0800
-@@ -3588,6 +3588,36 @@ session_child_run (struct passwd *pwent,
- 	else
- 		g_setenv ("PATH", gdm_daemon_config_get_value_string (GDM_KEY_PATH), TRUE);
- 
-+#ifdef __sun
-+	/*
-+	 * On Solaris, GDM is not yet the default login program, so we
-+	 * install the desktop files to a non-default location and GDM
-+	 * sets the XDG_DATA_DIR environment variable to include this
-+	 * location if GDM is used.  This way, GDM menu choices never
-+	 * appear if using CDE login, or any other login program.
-+	 */
-+	{
-+		const char * const *system_data_dirs;
-+		GString *temp_string;
-+		int i=0;
-+
-+		system_data_dirs = g_get_system_data_dirs ();
-+		temp_string      = g_string_new (NULL);
-+
-+		while (system_data_dirs[i] != NULL) {
-+			g_string_append (temp_string, system_data_dirs[i]);
-+			g_string_append (temp_string, ":");
-+			i++;
-+		}
-+
-+		if (temp_string->len > 0) {
-+			g_string_append (temp_string, "/usr/share/gdm/");
-+			g_setenv ("XDG_DATA_DIRS", temp_string->str, TRUE);
-+		}
-+		g_string_free(temp_string, TRUE);
-+	}
-+#endif
-+
- 	/* Eeeeek, this no lookie as a correct language code,
- 	 * just use the system default */
- 	if G_UNLIKELY ( ! ve_string_empty (language) &&