--- a/ChangeLog	Tue Aug 05 09:52:20 2008 +0000
+++ b/ChangeLog	Tue Aug 05 10:03:37 2008 +0000
@@ -1,3 +1,9 @@
+2008-08-05  Takao Fujiwara  <[email protected]>
+
+	* SUNWtgnome-tsoljdsdevmgr.spec: Updated for the patch.
+	* patches/tsoljdsdevmgr-02-no-gettext.diff: Added to fix SEGV on
+	  locales. Fixes 6727185.
+
 2008-08-05  Christian Kelly  <[email protected]>
 
 	* base-specs/gnome-terminal.spec: Bump to 2.23.6.

--- a/SUNWtgnome-tsoljdsdevmgr.spec	Tue Aug 05 09:52:20 2008 +0000
+++ b/SUNWtgnome-tsoljdsdevmgr.spec	Tue Aug 05 10:03:37 2008 +0000
@@ -19,6 +19,8 @@
 Source:			 http://dlc.sun.com/osol/jds/downloads/extras/tjds/tsoljdsdevmgr-%{devmgr_version}.tar.bz2
 # date:2008-07-10 owner:dcarbery type:bug
 Patch1:                  tsoljdsdevmgr-01-gtk-disable-deprecated.diff
+# date:2008-08-05 owner:fujiwara type:bug bugster:6727185 state:upstream
+Patch2:                  tsoljdsdevmgr-02-no-gettext.diff
 %if %build_l10n
 Source1:                 l10n-configure.sh
 %endif
@@ -47,6 +49,7 @@
 %prep
 %setup -q -n tsoljdsdevmgr-%{devmgr_version}
 %patch1 -p1
+%patch2 -p1
 
 %build
 export ACLOCAL_FLAGS="-I /usr/share/aclocal"
@@ -90,6 +93,9 @@
 %endif
 
 %changelog
+* Tue Aug  5 2008 - [email protected]
+- Add tsoljdsdevmgr-02-no-gettext.diff to avoid segv. Fixes 6727185.
+
 * Thu Jul 10 2008 - [email protected]
 - Add 01-gtk-disable-deprecated to get module to build with new gtk+ tarball.
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/tsoljdsdevmgr-02-no-gettext.diff	Tue Aug 05 10:03:37 2008 +0000
@@ -0,0 +1,20 @@
+--- tsoljdsdevmgr-0.6.2/src/devmgr-dialog.c.orig	2008-03-15 01:25:18.000000000 +0900
++++ tsoljdsdevmgr-0.6.2/src/devmgr-dialog.c	2008-08-05 17:56:29.879885000 +0900
+@@ -963,7 +963,7 @@ workspace_changed_callback(WnckScreen *s
+   	sprintf(message, _("<b>%s</b> does not have allocation capabilities--see user_attr(4)"),
+                 User[current_user].p.pw_name);
+   else
+-	sprintf(message, _(""));
++	sprintf(message, "");
+ 
+   gtk_label_set_markup (GTK_LABEL (alloc_label), message);
+ 
+@@ -2310,7 +2310,7 @@ devmgr_dialog_instance_init (DevMgrDialo
+   		sprintf(message, _("<b>%s</b> does not have allocation capabilities--see user_attr(4)"),
+ 			User[current_user].p.pw_name);
+ 	else
+-		sprintf(message, _(""), User[current_user].p.pw_name);
++		sprintf(message, "%s", User[current_user].p.pw_name);
+ 
+ 	gtk_label_set_markup (GTK_LABEL (alloc_label), message);
+