--- a/ChangeLog	Fri Aug 15 15:42:29 2003 +0000
+++ b/ChangeLog	Mon Aug 18 11:14:11 2003 +0000
@@ -1,3 +1,8 @@
+2003-08-18  Brian Nitz <[email protected]>
+
+	* addded patch gnome-mime-data-03-make-jmplay-default-player.diff
+ 	  to make jmplay the default media player for Mercury.
+
 2003-08-15  Matt Keenan	<[email protected]>
 
 	* gtkam.spec : added patch for menu entry and desktop file creation

--- a/gnome-mime-data.spec	Fri Aug 15 15:42:29 2003 +0000
+++ b/gnome-mime-data.spec	Mon Aug 18 11:14:11 2003 +0000
@@ -3,7 +3,7 @@
 Group:			System/GUI/GNOME
 BuildArchitectures:	noarch
 Version:		2.2.1
-Release:		1
+Release:		2
 Distribution:		Mercury
 Vendor:			Sun Microsystems, Inc.
 Summary:		MIME Type and Application Database for the GNOME Desktop
@@ -11,6 +11,7 @@
 Source1:                gnome-mime-data-l10n-po.tar.bz2
 Patch1:                 gnome-mime-data-01-view-as-audio-component.diff
 Patch2:                 gnome-mime-data-02-make-gpdf-component-default.diff
+Patch3:			gnome-mime-data-03-make-jmplay-default-player.diff
 URL:			http://www.gnome.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/%{name}
@@ -29,6 +30,7 @@
 %setup
 %patch1
 %patch2
+%patch3 -p1
 
 tar jxvf %SOURCE1
 %build
@@ -55,6 +57,9 @@
 %{_libdir}/pkgconfig/gnome-mime-data-2.0.pc
 
 %changelog
+* Mon Aug 18 2003 - [email protected]
+- created a patch to add jmplay as default media player.
+
 * Mon Aug 11 2003 - <[email protected]>
 - new tarball, reset release
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-mime-data-03-make-jmplay-default-player.diff	Mon Aug 18 11:14:11 2003 +0000
@@ -0,0 +1,168 @@
+diff -urN gnome-mime-data-2.2.1.orig/gnome-vfs.applications gnome-mime-data-2.2.1/gnome-vfs.applications
+--- gnome-mime-data-2.2.1.orig/gnome-vfs.applications	2002-10-06 12:14:35.000000000 -0700
++++ gnome-mime-data-2.2.1/gnome-vfs.applications	2003-08-15 13:03:00.000000000 -0700
+@@ -187,7 +187,7 @@
+ 	mime_types=application/x-gnumeric,application/x-applix-spreadsheet,application/vnd.ms-excel,application/vnd.lotus-1-2-3,application/x-oleo,application/x-xbase,text/spreadsheet,text/x-comma-separated-values,text/tab-separated-values
+ 
+ grecord
+-	command=gnome-sound-recorder -p
++	command=gnome-sound-recorder
+ 	name=Sound Recorder
+ 	can_open_multiple_files=false
+ 	expects_uris=false
+@@ -258,6 +258,15 @@
+ 	requires_terminal=false
+ 	mime_types=text/*,text/html,text/plain,text/x-c,text/x-c++,text/x-c-header
+ 
++jmplay
++        command=jmplay
++        name=Java Media Player
++        can_open_multiple_files=false
++        expects_uris=false
++        requires_terminal=false
++        mime_types=video/quicktime,video/x-avi,video/msvideo,video/x-msvideo,video/mpeg
++
++
+ killustrator
+ 	command=killustrator
+ 	name=KIllustrator
+diff -urN gnome-mime-data-2.2.1.orig/gnome-vfs.keys.in gnome-mime-data-2.2.1/gnome-vfs.keys.in
+--- gnome-mime-data-2.2.1.orig/gnome-vfs.keys.in	2003-08-15 10:30:09.000000000 -0700
++++ gnome-mime-data-2.2.1/gnome-vfs.keys.in	2003-08-15 13:02:47.000000000 -0700
+@@ -958,6 +958,10 @@
+ audio/basic
+ 	_description=basic audio
+ 	icon_filename=gnome-audio
++        default_action_type=application
++        short_list_application_ids_for_novice_user_level=jmplay,grecord
++        short_list_application_ids_for_intermediate_user_level=jmplay,grecord
++        short_list_application_ids_for_advanced_user_level=jmplay,grecord
+ 	_category=Audio
+ 
+ # also audio/x-mpeg
+@@ -965,9 +969,9 @@
+ 	_description=MPEG audio
+ 	icon_filename=i-music
+ 	default_action_type=application
+-	short_list_application_ids_for_novice_user_level=xmms,freeamp,mpg123
+-	short_list_application_ids_for_intermediate_user_level=xmms,freeamp,mpg123
+-	short_list_application_ids_for_advanced_user_level=xmms,freeamp,mpg123
++	short_list_application_ids_for_novice_user_level=jmplay,xmms,freeamp,mpg123
++	short_list_application_ids_for_intermediate_user_level=jmplay,xmms,freeamp,mpg123
++	short_list_application_ids_for_advanced_user_level=jmplay,xmms,freeamp,mpg123
+ 	_category=Audio
+ 
+ audio/prs.sid
+@@ -982,9 +986,9 @@
+ audio/x-aiff
+ 	_description=AIFF audio
+ 	default_action_type=application
+-	short_list_application_ids_for_novice_user_level=grecord
+-	short_list_application_ids_for_intermediate_user_level=grecord
+-	short_list_application_ids_for_advanced_user_level=grecord
++	short_list_application_ids_for_novice_user_level=jmplay,grecord
++	short_list_application_ids_for_intermediate_user_level=jmplay,grecord
++	short_list_application_ids_for_advanced_user_level=jmplay,grecord
+ 	_category=Audio
+ 
+ audio/x-aiffc
+@@ -1004,6 +1008,10 @@
+ audio/x-midi
+ 	_description=MIDI audio
+ 	icon_filename=gnome-audio-midi
++        default_action_type=application
++        short_list_application_ids_for_novice_user_level=jmplay
++        short_list_application_ids_for_intermediate_user_level=jmplay
++        short_list_application_ids_for_advanced_user_level=jmplay
+ 	_category=Audio
+ 
+ audio/x-mod
+@@ -1019,9 +1027,9 @@
+ 	_description=MP3 audio
+ 	icon_filename=i-music
+ 	default_action_type=application
+-	short_list_application_ids_for_novice_user_level=xmms,freeamp,mpg123
+-	short_list_application_ids_for_intermediate_user_level=xmms,freeamp,mpg123
+-	short_list_application_ids_for_advanced_user_level=xmms,freeamp,mpg123
++	short_list_application_ids_for_novice_user_level=jmplay,xmms,freeamp,mpg123
++	short_list_application_ids_for_intermediate_user_level=jmplay,xmms,freeamp,mpg123
++	short_list_application_ids_for_advanced_user_level=jmplay,xmms,freeamp,mpg123
+ 	_category=Audio
+ 
+ audio/x-mp3-playlist
+@@ -1119,9 +1127,9 @@
+ audio/x-wav
+ 	_description=wave audio
+ 	default_action_type=application
+-	short_list_application_ids_for_novice_user_level=grecord,xmms,freeamp
+-	short_list_application_ids_for_intermediate_user_level=grecord,xmms,freeamp
+-	short_list_application_ids_for_advanced_user_level=grecord,xmms,freeamp
++	short_list_application_ids_for_novice_user_level=jmplay,grecord,xmms,freeamp
++	short_list_application_ids_for_intermediate_user_level=jmplay,grecord,xmms,freeamp
++	short_list_application_ids_for_advanced_user_level=jmplay,grecord,xmms,freeamp
+ 	_category=Audio
+ 
+ audio/x-xi
+@@ -1928,25 +1936,26 @@
+ video/mpeg
+ 	_description=MPEG video
+ 	default_action_type=application
+-	short_list_application_ids_for_novice_user_level=vlc,xmps,plaympeg,omsomi,mpeg_play,gtv
+-	short_list_application_ids_for_intermediate_user_level=vlc,xmps,plaympeg,omsomi,mpeg_play,gtv
+-	short_list_application_ids_for_advanced_user_level=vlc,xmps,plaympeg,omsomi,mpeg_play,gtv
++	short_list_application_ids_for_novice_user_level=jmplay,vlc,xmps,plaympeg,omsomi,mpeg_play,gtv
++	short_list_application_ids_for_intermediate_user_level=jmplay,vlc,xmps,plaympeg,omsomi,mpeg_play,gtv
++	short_list_application_ids_for_advanced_user_level=jmplay,vlc,xmps,plaympeg,omsomi,mpeg_play,gtv
+ 	_category=Video
+ 
+ video/msvideo
+ 	_description=MS video
+ 	icon_filename=gnome-video-x-msvideo
+-	short_list_application_ids_for_novice_user_level=xmps,omsomi,gtv,xanim
+-	short_list_application_ids_for_intermediate_user_level=xmps,omsomi,gtv,xanim
+-	short_list_application_ids_for_advanced_user_level=xmps,omsomi,gtv,xanim
++	default_action_type=application
++	short_list_application_ids_for_novice_user_level=jmplay,xmps,omsomi,gtv,xanim
++	short_list_application_ids_for_intermediate_user_level=jmplay,xmps,omsomi,gtv,xanim
++	short_list_application_ids_for_advanced_user_level=jmplay,xmps,omsomi,gtv,xanim
+ 	_category=Video
+ 
+ video/quicktime
+ 	_description=QuickTime movie
+ 	default_action_type=application
+-	short_list_application_ids_for_novice_user_level=xanim
+-	short_list_application_ids_for_intermediate_user_level=xanim
+-	short_list_application_ids_for_advanced_user_level=xanim
++	short_list_application_ids_for_novice_user_level=jmplay,xanim
++	short_list_application_ids_for_intermediate_user_level=jmplay,xanim
++	short_list_application_ids_for_advanced_user_level=jmplay,xanim
+ 	_category=Video
+ 
+ video/vivo
+@@ -1968,9 +1977,9 @@
+ video/x-avi
+ 	_description=AVI video
+ 	default_action_type=application
+-	short_list_application_ids_for_novice_user_level=xanim
+-	short_list_application_ids_for_intermediate_user_level=xanim
+-	short_list_application_ids_for_advanced_user_level=xanim
++	short_list_application_ids_for_novice_user_level=jmplay,xanim
++	short_list_application_ids_for_intermediate_user_level=jmplay,xanim
++	short_list_application_ids_for_advanced_user_level=jmplay,xanim
+ 	_category=Video
+ 
+ video/x-flc
+@@ -2002,9 +2011,10 @@
+ 
+ video/x-msvideo
+ 	_description=Microsoft video
+-	short_list_application_ids_for_novice_user_level=xmps,omsomi,xanim
+-	short_list_application_ids_for_intermediate_user_level=xmps,omsomi,xanim
+-	short_list_application_ids_for_advanced_user_level=xmps,omsomi,xanim
++	default_action_type=application
++	short_list_application_ids_for_novice_user_level=jmplay,xmps,omsomi,xanim
++	short_list_application_ids_for_intermediate_user_level=jmplay,xmps,omsomi,xanim
++	short_list_application_ids_for_advanced_user_level=jmplay,xmps,omsomi,xanim
+ 	_category=Video
+ 
+ video/x-real-video