diff --git a/gnome-vfs-2.13.3-gnome-mount.patch b/gnome-vfs-2.13.3-gnome-mount.patch new file mode 100644 index 0000000..2729175 --- /dev/null +++ b/gnome-vfs-2.13.3-gnome-mount.patch @@ -0,0 +1,53 @@ +--- gnome-vfs-2.13.3/libgnomevfs/gnome-vfs-volume-ops.c.gnome-mount 2006-01-09 15:05:47.000000000 -0500 ++++ gnome-vfs-2.13.3/libgnomevfs/gnome-vfs-volume-ops.c 2006-01-09 15:16:10.000000000 -0500 +@@ -659,8 +659,9 @@ + #if defined(USE_HAL) && defined(HAL_EJECT) + if (info->hal_udi != NULL) { + argv[0] = HAL_EJECT; +- argv[1] = info->device_path; +- argv[2] = NULL; ++ argv[1] = "--hal-udi"; ++ argv[2] = info->hal_udi; ++ argv[3] = NULL; + + if (!g_file_test (argv [0], G_FILE_TEST_IS_EXECUTABLE)) + argv[0] = NULL; +@@ -759,7 +760,11 @@ + + # ifdef USE_HAL + if (hal_udi != NULL) { ++# ifdef HAL_MOUNT ++ name = hal_udi; ++# else + name = device_path; ++# endif + } else + name = mount_point; + # else +@@ -770,9 +775,11 @@ + + if (should_mount) { + #if defined(USE_HAL) && defined(HAL_MOUNT) +- if (hal_udi != NULL && g_file_test (HAL_MOUNT, G_FILE_TEST_IS_EXECUTABLE)) ++ if (hal_udi != NULL && g_file_test (HAL_MOUNT, G_FILE_TEST_IS_EXECUTABLE)) { + command = HAL_MOUNT; +- else ++ argument = "--hal-udi"; ++ ++ } else + command = find_command (MOUNT_COMMAND); + #else + command = find_command (MOUNT_COMMAND); +@@ -785,9 +792,10 @@ + if (should_unmount) { + gboolean is_in_media = g_str_has_prefix (mount_point, "/media"); + #if defined(USE_HAL) && defined(HAL_UMOUNT) +- if (hal_udi != NULL && g_file_test (HAL_UMOUNT, G_FILE_TEST_IS_EXECUTABLE)) ++ if (hal_udi != NULL && g_file_test (HAL_UMOUNT, G_FILE_TEST_IS_EXECUTABLE)) { + command = HAL_UMOUNT; +- else ++ argument = "--hal-udi"; ++ } else + command = find_command (is_in_media ? PUMOUNT_COMMAND : UMOUNT_COMMAND); + #else + command = find_command (is_in_media ? PUMOUNT_COMMAND : UMOUNT_COMMAND); diff --git a/gnome-vfs2.spec b/gnome-vfs2.spec index a84fd3b..55f8bb9 100644 --- a/gnome-vfs2.spec +++ b/gnome-vfs2.spec @@ -9,7 +9,7 @@ Summary: The GNOME virtual file-system libraries. Name: gnome-vfs2 Version: 2.13.3 -Release: 2 +Release: 3 License: LGPL Group: System Environment/Libraries Source0: gnome-vfs-%{version}.tar.bz2 @@ -45,6 +45,8 @@ Patch104: gnome-vfs-2.8.2-browser_default.patch Patch201: gnome-vfs-2.8.1-console-mount-opt.patch +Patch202: gnome-vfs-2.13.3-gnome-mount.patch + %description GNOME VFS is the GNOME virtual file system. It is the foundation of the Nautilus file manager. It provides a modular architecture and @@ -88,6 +90,7 @@ shares (SMB) to applications using GNOME VFS. %patch104 -p1 -b .browser_default %patch201 -p0 -b .console +%patch202 -p1 -b .gnome-mount %build @@ -173,6 +176,9 @@ done %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf %changelog +* Mon Jan 09 2006 John (J5) Palmieri 2.13.3-3 +- Add patch so --hal-udi is sent in when mounting and unmounting + * Mon Jan 09 2006 John (J5) Palmieri 2.13.3-2 - Add dependency on gnome-mount - Add configure options for gnome-mount