--- a/ChangeLog	Wed May 12 10:15:38 2004 +0000
+++ b/ChangeLog	Wed May 12 10:46:32 2004 +0000
@@ -1,3 +1,9 @@
+2004-05-12  Laszlo Kovacs  <[email protected]>
+	* gnome-panel.spec,
+	patches/gnome-panel-03-menu-changes.diff,
+	patches/gnome-panel-09-lockdown.diff:
+	change jds-help.sh top jdshelp
+
 2004-05-12  Leena Gunda  <[email protected]>
 
 	* metacity.spec:

--- a/gnome-panel.spec	Wed May 12 10:15:38 2004 +0000
+++ b/gnome-panel.spec	Wed May 12 10:46:32 2004 +0000
@@ -2,7 +2,7 @@
 License:      GPL
 Group:        System/GUI/GNOME
 Version:      2.6.1
-Release:      1
+Release:      2 
 Distribution: Cinnabar
 Vendor:       Sun Microsystems, Inc.
 Summary:      The GNOME Panel
@@ -217,6 +217,8 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed May 12 2004 - [email protected]
+- change jds-help.sh to jdshelp
 * Fri May 07 2004 - [email protected]
 - Bump to 2.6.1, remerge patch-02-default-setup & patch-09-lockdown
 

--- a/libgnome.spec	Wed May 12 10:15:38 2004 +0000
+++ b/libgnome.spec	Wed May 12 10:46:32 2004 +0000
@@ -2,7 +2,7 @@
 License:      LGPL
 Group:        System/Libraries/GNOME
 Version:      2.6.0
-Release:      11
+Release:      12
 Distribution: Cinnabar
 Vendor:       Sun Microsystems, Inc.
 Summary:      GNOME Base Library
@@ -15,7 +15,6 @@
 Patch2:       libgnome-02-default-theme.diff
 Patch3:       libgnome-03-lockdown-schemas.diff
 Patch4:       libgnome-04-moniker-build.diff
-Patch5:       libgnome-05-input-method-status-style.diff
 URL:          http://www.gnome.org
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Docdir:	      %{_defaultdocdir}/doc
@@ -69,7 +68,6 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 libtoolize --force
@@ -144,8 +142,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Thu May 11 2004 - [email protected]
-- Add libgnome-05-input-method-status-style.diff
+* Tue May 11 2004 - [email protected]
+- rename jdshelp script
 * Thu May 06 2004 - [email protected]
 - replacing yelp with jds-help.sh in libgnome-03-lockdown-schemas.diff
 * Mon May 3 2004 - [email protected]

--- a/patches/gnome-panel-03-menu-changes.diff	Wed May 12 10:15:38 2004 +0000
+++ b/patches/gnome-panel-03-menu-changes.diff	Wed May 12 10:46:32 2004 +0000
@@ -99,13 +99,13 @@
 -	if (!root_menu)
 -		root_menu = menu_new ();
 +	GdkScreen	*screen;
-+	const gchar	*argv = g_strdup("jds-help.sh");
++	const gchar	*argv = g_strdup("jdshelp");
 +	GError		*error = NULL;
 +
 +	screen = gtk_widget_get_screen (widget);
 +	if (!gdk_spawn_command_line_on_screen (screen, argv, &error))
 +		panel_error_dialog (screen, 
-+				    "cannot_exec_jds_help",
++				    "cannot_exec_jdshelp",
 +				    _("Cannot execute '%s'"),
 +				    _("%s - command not found"),
 +				    _("GNOME Help"),
@@ -262,7 +262,7 @@
 +	add_uri_submenu (menu, "preferences:///", _("Preferences"), PANEL_STOCK_PREFERENCES);
 +
 +	/* Help */
-+	if (panel_is_program_in_path ("jds-help.sh")) {
++	if (panel_is_program_in_path ("jdshelp")) {
  		menuitem = gtk_image_menu_item_new ();
  		setup_stock_menu_item (
  			menuitem, panel_menu_icon_get_size (),

--- a/patches/gnome-panel-09-lockdown.diff	Wed May 12 10:15:38 2004 +0000
+++ b/patches/gnome-panel-09-lockdown.diff	Wed May 12 10:46:32 2004 +0000
@@ -194,10 +194,10 @@
  	add_uri_submenu (menu, "preferences:///", _("Preferences"), PANEL_STOCK_PREFERENCES);
  
  	/* Help */
--	if (panel_is_program_in_path ("jds-help.sh")) {
-+	if (panel_is_program_in_path ("jds-help.sh") &&
+-	if (panel_is_program_in_path ("jdshelp")) {
++	if (panel_is_program_in_path ("jdshelp") &&
 +	    ((panel_lockdown_get_restrict_application_launching () &&
-+	      panel_lockdown_is_allowed_application ("/usr/bin/jds-help.sh")) ||
++	      panel_lockdown_is_allowed_application ("/usr/bin/jdshelp")) ||
 +	     (!panel_lockdown_get_restrict_application_launching ()))) {
  		menuitem = gtk_image_menu_item_new ();
  		setup_stock_menu_item (

--- a/patches/libgnome-03-lockdown-schemas.diff	Wed May 12 10:15:38 2004 +0000
+++ b/patches/libgnome-03-lockdown-schemas.diff	Wed May 12 10:46:32 2004 +0000
@@ -26,7 +26,7 @@
 +      <owner>gnome</owner>
 +      <type>list</type>
 +      <list_type>string</list_type>
-+      <default>[/usr/bin/gnome-terminal,/usr/bin/mozilla,/usr/bin/staroffice,/usr/bin/evolution-1.4,/usr/bin/file-roller,/usr/bin/gcalctool,/usr/bin/gucharmap,/usr/bin/gnome-dictionary,/usr/bin/gedit,/usr/bin/freecell,/usr/bin/gtali,/usr/bin/gataxx,/usr/bin/glines,/usr/bin/gnect,/usr/bin/gnibbles,/usr/bin/gnotski,/usr/bin/iagno,/usr/bin/mahjongg,/usr/bin/gnomine,/usr/bin/gnobots2,/usr/bin/same-gnome,/usr/bin/gnome-stones,/usr/bin/gnotravex,/usr/bin/eog,/usr/bin/ggv,/usr/bin/gaim,/usr/bin/gnome-cd,/usr/bin/gnome-sound-recorder,/usr/bin/gnome-volume-control,/usr/bin/bug-buddy,/usr/bin/glade-2,/usr/bin/YaST2,/usr/bin/gconf-editor,/usr/bin/gfloppy,/usr/bin/gdmsetup,/usr/bin/gdmflexiserver,/usr/bin/gnome-system-monitor,/usr/bin/gnome-search-tool,/usr/bin/dia,/usr/bin/gtkam,/usr/bin/gimp-1.3,/usr/bin/gthumb,/usr/java/j2re1.4.2_01/bin/ControlPanel,/usr/java/j2redefault/bin/jmplay,/usr/bin/totem,/usr/bin/mrproject,/usr/bin/gnomemeeting,/usr/bin/jdictionary,/usr/bin/jdiskreport,/usr/bin/jedit,/usr/bin/jgraphpad,/usr/bin/cddbslave2-properties,/usr/bin/gnome-cd-properties,/usr/bin/gnome-file-type-properties,/usr/bin/gnome-panel-preferences,/usr/bin/gnome-default-applications-properties,/usr/bin/gnome-session-properties,/usr/bin/gnome-background-properties,/usr/bin/gnome-font-properties,/usr/bin/gnome-ui-properties,/usr/bin/gnome-display-properties,/usr/bin/xscreensaver-demo,/usr/bin/nautilus,/usr/bin/gnome-sound-properties,/usr/bin/userpasswd,/usr/bin/gpilotd-control-applet,/usr/bin/gnome-mouse-properties,/usr/bin/gnome-network-preferences,/usr/bin/nautilus-file-management-properties,/usr/bin/gnome-keybinding-properties,/usr/bin/acme-properties,/usr/bin/gnome-keyboard-layout,/usr/bin/gnome-keyboard-properties,/usr/bin/gnome-theme-manager,/usr/bin/gnome-window-properties,/usr/bin/gnome-accessibility-keyboard-properties,/usr/bin/jds-help.sh]</default>
++      <default>[/usr/bin/gnome-terminal,/usr/bin/mozilla,/usr/bin/staroffice,/usr/bin/evolution-1.4,/usr/bin/file-roller,/usr/bin/gcalctool,/usr/bin/gucharmap,/usr/bin/gnome-dictionary,/usr/bin/gedit,/usr/bin/freecell,/usr/bin/gtali,/usr/bin/gataxx,/usr/bin/glines,/usr/bin/gnect,/usr/bin/gnibbles,/usr/bin/gnotski,/usr/bin/iagno,/usr/bin/mahjongg,/usr/bin/gnomine,/usr/bin/gnobots2,/usr/bin/same-gnome,/usr/bin/gnome-stones,/usr/bin/gnotravex,/usr/bin/eog,/usr/bin/ggv,/usr/bin/gaim,/usr/bin/gnome-cd,/usr/bin/gnome-sound-recorder,/usr/bin/gnome-volume-control,/usr/bin/bug-buddy,/usr/bin/glade-2,/usr/bin/YaST2,/usr/bin/gconf-editor,/usr/bin/gfloppy,/usr/bin/gdmsetup,/usr/bin/gdmflexiserver,/usr/bin/gnome-system-monitor,/usr/bin/gnome-search-tool,/usr/bin/dia,/usr/bin/gtkam,/usr/bin/gimp-1.3,/usr/bin/gthumb,/usr/java/j2re1.4.2_01/bin/ControlPanel,/usr/java/j2redefault/bin/jmplay,/usr/bin/totem,/usr/bin/mrproject,/usr/bin/gnomemeeting,/usr/bin/jdictionary,/usr/bin/jdiskreport,/usr/bin/jedit,/usr/bin/jgraphpad,/usr/bin/cddbslave2-properties,/usr/bin/gnome-cd-properties,/usr/bin/gnome-file-type-properties,/usr/bin/gnome-panel-preferences,/usr/bin/gnome-default-applications-properties,/usr/bin/gnome-session-properties,/usr/bin/gnome-background-properties,/usr/bin/gnome-font-properties,/usr/bin/gnome-ui-properties,/usr/bin/gnome-display-properties,/usr/bin/xscreensaver-demo,/usr/bin/nautilus,/usr/bin/gnome-sound-properties,/usr/bin/userpasswd,/usr/bin/gpilotd-control-applet,/usr/bin/gnome-mouse-properties,/usr/bin/gnome-network-preferences,/usr/bin/nautilus-file-management-properties,/usr/bin/gnome-keybinding-properties,/usr/bin/acme-properties,/usr/bin/gnome-keyboard-layout,/usr/bin/gnome-keyboard-properties,/usr/bin/gnome-theme-manager,/usr/bin/gnome-window-properties,/usr/bin/gnome-accessibility-keyboard-properties,/usr/bin/jdshelp]</default>
 +      <locale name="C">
 +        <short>Allowed Applications List</short>
 +        <long>