2004-02-23 Stephen Browne <[email protected]>
authorstephen
Mon, 23 Feb 2004 14:27:25 +0000
changeset 1884 53a8d68a3c50
parent 1883 70feca65a32e
child 1885 419e57af13ef
2004-02-23 Stephen Browne <[email protected]> * gnome-vfs.spec: reactivated ported patch 11 * patches/gnome-vfs-11-this-comp-and-hotplug-names.diff: ported to 2.5.7
ChangeLog
gnome-vfs.spec
patches/gnome-vfs-11-this-comp-and-hotplug-names.diff
--- a/ChangeLog	Mon Feb 23 14:18:25 2004 +0000
+++ b/ChangeLog	Mon Feb 23 14:27:25 2004 +0000
@@ -1,3 +1,9 @@
+2004-02-23  Stephen Browne  <[email protected]>
+
+	* gnome-vfs.spec: reactivated ported patch 11
+	* patches/gnome-vfs-11-this-comp-and-hotplug-names.diff: 
+	ported to 2.5.7
+	
 2004-02-23  Stephen Browne  <[email protected]>
 
 	* gnome-vfs.spec: reactivate ported patch 05
--- a/gnome-vfs.spec	Mon Feb 23 14:18:25 2004 +0000
+++ b/gnome-vfs.spec	Mon Feb 23 14:27:25 2004 +0000
@@ -2,7 +2,7 @@
 License:      LGPL
 Group:        System/Libraries/GNOME
 Version:      2.5.7
-Release:      6
+Release:      7
 Distribution: Cinnabar
 Vendor:       Sun Microsystems, Inc.
 Summary:      Virtual File System Library for GNOME
@@ -73,7 +73,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-#%patch11 -p1 Stephen to fix
+%patch11 -p1
 
 bzcat %SOURCE1 | tar xvf -
 
@@ -145,6 +145,9 @@
 
 %changelog
 * Mon Feb 23 2004 - [email protected]
+- reactivate ported patches 05 and 11
+
+* Mon Feb 23 2004 - [email protected]
 - reactivate ported patch 03 
 
 * Mon Feb 23 2004 - [email protected]
--- a/patches/gnome-vfs-11-this-comp-and-hotplug-names.diff	Mon Feb 23 14:18:25 2004 +0000
+++ b/patches/gnome-vfs-11-this-comp-and-hotplug-names.diff	Mon Feb 23 14:27:25 2004 +0000
@@ -252,30 +252,3 @@
  	case COMPUTER_DRIVE:
  		data = get_data_for_drive (file->drive);
  		break;
-@@ -851,7 +936,7 @@
- 	g_free (entry->data);
- 	g_list_free_1 (entry);
- 
--	file_info->mime_type = g_strdup ("application/x-gnome-app-info");
-+	file_info->mime_type = g_strdup ("application/x-desktop");
- 	file_info->type = GNOME_VFS_FILE_TYPE_REGULAR;
- 	file_info->valid_fields |=
- 		GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE |
-@@ -886,7 +971,7 @@
- 	} else {
- 		file_info->name = gnome_vfs_uri_extract_short_name (uri);
- 		
--		file_info->mime_type = g_strdup ("application/x-gnome-app-info");
-+		file_info->mime_type = g_strdup ("application/x-desktop");
- 		file_info->type = GNOME_VFS_FILE_TYPE_REGULAR;
- 		file_info->valid_fields |=
- 			GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE |
-@@ -914,7 +999,7 @@
- 
- 	file_info->valid_fields = GNOME_VFS_FILE_INFO_FIELDS_NONE;
- 	
--	file_info->mime_type = g_strdup ("application/x-gnome-app-info");
-+	file_info->mime_type = g_strdup ("application/x-desktop");
- 	file_info->size = file_handle->len;
- 	file_info->type = GNOME_VFS_FILE_TYPE_REGULAR;
- 	file_info->valid_fields |=