--- a/ChangeLog	Mon Jul 28 16:27:38 2003 +0000
+++ b/ChangeLog	Mon Jul 28 16:42:02 2003 +0000
@@ -1,3 +1,15 @@
+2003-07-28  Mark McLoughlin  <[email protected]>
+
+	* gnome-mime-data.spec: add patch, bump release.
+
+	* patches/gnome-mime-data-01-view-as-audio-component.diff: upd.
+
+	* patches/gnome-mime-data-02-make-gpdf-component-default.diff:
+	Make pdfs be opened by the component by default.
+
+	* patches/gnome-mime-data-02-view-as-web-page.diff: remove. Seems
+	to be unused.
+
 2003-07-28  Stephen Browne <[email protected]>
 
 	* removed j2se-integration.spec

--- a/gnome-mime-data.spec	Mon Jul 28 16:27:38 2003 +0000
+++ b/gnome-mime-data.spec	Mon Jul 28 16:42:02 2003 +0000
@@ -3,14 +3,14 @@
 Group:			System/GUI/GNOME
 BuildArchitectures:	noarch
 Version:		2.2.0
-Release:		8	
+Release:		8
 Distribution:		Mercury
 Vendor:			Sun Microsystems, Inc.
 Summary:		MIME Type and Application Database for the GNOME Desktop
 Source:			http://ftp.gnome.org:/pub/GNOME/sources/gnome-mime-data/2.2/%{name}-%{version}.tar.bz2
 Source1:                gnome-mime-data-l10n-po.tar.bz2
-Patch0:                 gnome-mime-data-01-view-as-audio-component.diff
-Patch1:                 gnome-mime-data-02-view-as-web-page.diff
+Patch1:                 gnome-mime-data-01-view-as-audio-component.diff
+Patch2:                 gnome-mime-data-02-make-gpdf-component-default.diff
 URL:			http://www.gnome.org
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/%{name}
@@ -27,8 +27,8 @@
 
 %prep
 %setup
-%patch0 -p1
-%patch1 -p1
+%patch1
+%patch2
 
 tar jxvf %SOURCE1
 %build
@@ -55,12 +55,14 @@
 %{_libdir}/pkgconfig/gnome-mime-data-2.0.pc
 
 %changelog
-* Mon Jul 28 2003 - [email protected]
-- add gnome-mime-data-02-view-as-web-page.diff
+* Mon Jul 28 2003 - <[email protected]>
+- Make pdfs get opened in the gpdf component by default
+
 * Wed Jul 09 2003 - <[email protected]>
 - add in sun po files
 
-* Mon Jul 07 2003 - [email protected]
+* Mon Jul 07 2003 - <[email protected]>
 - added patch to shortlist nautilus_audio_view for viewing directory contents.
+
 * Thu May 13 2003 - [email protected]
 - Created new spec file for gnome-mime-data

--- a/patches/gnome-mime-data-01-view-as-audio-component.diff	Mon Jul 28 16:27:38 2003 +0000
+++ b/patches/gnome-mime-data-01-view-as-audio-component.diff	Mon Jul 28 16:42:02 2003 +0000
@@ -1,5 +1,5 @@
---- gnome-mime-data-2.2.0/gnome-vfs.keys.in	2003-02-04 09:05:11.000000000 +0000
-+++ gnome-mime-data-2.2.0.mod/gnome-vfs.keys.in	2003-07-04 18:08:09.000000000 +0100
+--- gnome-vfs.keys.in	2003-02-04 09:05:11.000000000 +0000
++++ gnome-vfs.keys.in	2003-07-04 18:08:09.000000000 +0100
 @@ -2026,7 +2026,7 @@
  x-directory/normal
  	_description=folder

--- a/patches/gnome-mime-data-02-make-gpdf-component-default.diff	Mon Jul 28 16:27:38 2003 +0000
+++ b/patches/gnome-mime-data-02-make-gpdf-component-default.diff	Mon Jul 28 16:42:02 2003 +0000
@@ -1,28 +1,31 @@
-? t.tmp
-Index: ChangeLog
-===================================================================
-RCS file: /cvs/gnome/gnome-mime-data/ChangeLog,v
-retrieving revision 1.175
-diff -u -p -r1.175 ChangeLog
---- ChangeLog	22 Jul 2003 22:19:36 -0000	1.175
-+++ ChangeLog	28 Jul 2003 16:23:30 -0000
-@@ -1,3 +1,8 @@
-+2003-07-28  Mark McLoughlin  <[email protected]>
-+
-+	* gnome-vfs.keys.in: make the default action for pdf to use
-+	the gpdf embedded viewer.
-+
- 2003-07-22  Bastien Nocera  <[email protected]>
- 
- 	* AUTHORS: spell my name properly
-Index: gnome-vfs.keys.in
-===================================================================
-RCS file: /cvs/gnome/gnome-mime-data/gnome-vfs.keys.in,v
-retrieving revision 1.98
-diff -u -p -r1.98 gnome-vfs.keys.in
---- gnome-vfs.keys.in	22 Jul 2003 22:19:36 -0000	1.98
-+++ gnome-vfs.keys.in	28 Jul 2003 16:23:31 -0000
-@@ -54,10 +54,10 @@ application/ogg
+diff -urNp ../gnome-mime-data-2.2.0.old/gnome-vfs.keys ./gnome-vfs.keys
+--- ../gnome-mime-data-2.2.0.old/gnome-vfs.keys	2003-02-04 09:07:06.000000000 +0000
++++ ./gnome-vfs.keys	2003-07-28 18:52:16.000000000 +0100
+@@ -509,13 +509,13 @@ application/pdf
+ 	[wa]description=documint PDF
+ 	[zh_CN]description=PDF文档
+ 	[zh_TW]description=PDF 文件
+-	default_action_type=application
+-	short_list_component_iids_for_novice_user_level=OAFIID:gpdf_component:892f2727-e2ec-423c-91ad-6f7b75fec6c8
+-	short_list_component_iids_for_intermediate_user_level=OAFIID:gpdf_component:892f2727-e2ec-423c-91ad-6f7b75fec6c8
+-	short_list_component_iids_for_advanced_user_level=OAFIID:gpdf_component:892f2727-e2ec-423c-91ad-6f7b75fec6c8
+-	short_list_application_ids_for_novice_user_level=acroread,xpdf,ggv,gv
+-	short_list_application_ids_for_intermediate_user_level=acroread,xpdf,ggv,gv
+-	short_list_application_ids_for_advanced_user_level=acroread,xpdf,ggv,gv
++	default_action_type=component
++	short_list_component_iids_for_novice_user_level=OAFIID:GNOME_PDF_Control
++	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_PDF_Control
++	short_list_component_iids_for_advanced_user_level=OAFIID:GNOME_PDF_Control
++	short_list_application_ids_for_novice_user_level=acroread,gpdf,xpdf,ggv,gv
++	short_list_application_ids_for_intermediate_user_level=acroread,gpdf,xpdf,ggv,gv
++	short_list_application_ids_for_advanced_user_level=acroread,gpdf,xpdf,ggv,gv
+ 	category=Documents/Published Materials
+ 	[am]category=ሰነዶች/Published Materials
+ 	[be]category=Дакумэнты/Матэрыялы публікацыі
+diff -urNp ../gnome-mime-data-2.2.0.old/gnome-vfs.keys.in ./gnome-vfs.keys.in
+--- ../gnome-mime-data-2.2.0.old/gnome-vfs.keys.in	2003-02-04 09:05:11.000000000 +0000
++++ ./gnome-vfs.keys.in	2003-07-28 18:50:15.000000000 +0100
+@@ -45,13 +45,13 @@ application/oda
  
  application/pdf
  	_description=PDF document
@@ -30,10 +33,16 @@
 -	short_list_component_iids_for_novice_user_level=OAFIID:gpdf_component:892f2727-e2ec-423c-91ad-6f7b75fec6c8
 -	short_list_component_iids_for_intermediate_user_level=OAFIID:gpdf_component:892f2727-e2ec-423c-91ad-6f7b75fec6c8
 -	short_list_component_iids_for_advanced_user_level=OAFIID:gpdf_component:892f2727-e2ec-423c-91ad-6f7b75fec6c8
+-	short_list_application_ids_for_novice_user_level=acroread,xpdf,ggv,gv
+-	short_list_application_ids_for_intermediate_user_level=acroread,xpdf,ggv,gv
+-	short_list_application_ids_for_advanced_user_level=acroread,xpdf,ggv,gv
 +	default_action_type=component
 +	short_list_component_iids_for_novice_user_level=OAFIID:GNOME_PDF_Control
 +	short_list_component_iids_for_intermediate_user_level=OAFIID:GNOME_PDF_Control
 +	short_list_component_iids_for_advanced_user_level=OAFIID:GNOME_PDF_Control
- 	short_list_application_ids_for_novice_user_level=acroread,gpdf,xpdf,ggv,gv
- 	short_list_application_ids_for_intermediate_user_level=acroread,gpdf,xpdf,ggv,gv
- 	short_list_application_ids_for_advanced_user_level=acroread,gpdf,xpdf,ggv,gv
++	short_list_application_ids_for_novice_user_level=acroread,gpdf,xpdf,ggv,gv
++	short_list_application_ids_for_intermediate_user_level=acroread,gpdf,xpdf,ggv,gv
++	short_list_application_ids_for_advanced_user_level=acroread,gpdf,xpdf,ggv,gv
+ 	_category=Documents/Published Materials
+ 	use_category_default=yes
+ 

--- a/patches/gnome-mime-data-02-view-as-web-page.diff	Mon Jul 28 16:27:38 2003 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gnome-mime-data-2.2.0/gnome-vfs.keys.in.orig	2003-07-28 11:23:10.000000000 +0100
-+++ gnome-mime-data-2.2.0/gnome-vfs.keys.in	2003-07-28 11:23:13.000000000 +0100
-@@ -1626,7 +1626,7 @@
- text/html
- 	_description=HTML page
- 	default_action_type=application
--	short_list_component_iids=OAFIID:nautilus_mozilla_content_view:1ee70717-57bf-4079-aae5-922abdd576b1,OAFIID:Nautilus_Text_View
-+	short_list_component_iids=OAFIID:GNOME_Epiphany_NautilusView,OAFIID:Nautilus_Text_View
- 	short_list_component_iids_for_novice_user_level=OAFIID:nautilus_mozilla_content_view:1ee70717-57bf-4079-aae5-922abdd576b1,OAFIID:nautilus_text_view:fa466311-17c1-435c-8231-c9fc434b6437
- 	short_list_component_iids_for_intermediate_user_level=OAFIID:nautilus_mozilla_content_view:1ee70717-57bf-4079-aae5-922abdd576b1,OAFIID:nautilus_text_view:fa466311-17c1-435c-8231-c9fc434b6437
- 	short_list_component_iids_for_advanced_user_level=OAFIID:nautilus_mozilla_content_view:1ee70717-57bf-4079-aae5-922abdd576b1,OAFIID:nautilus_text_view:fa466311-17c1-435c-8231-c9fc434b6437