Thu Nov 12 17:32:43 UTC 2009

Author: mclasen

Update of /cvs/pkgs/rpms/gvfs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6953

Modified Files:
	gvfs.spec sources 
Added Files:
	gvfs-1.4.2-handle-null-gdudevices.patch 
	gvfs-1.4.2-remove-dead-code.patch gvfs-1.4.2-smb-queryfs.patch 
Removed Files:
	0001-Disallow-mounting-empty-drives.patch 
	0002-Disallow-ejecting-empty-drives.patch 
	0003-Silently-drop-eject-error-messages-when-detaching-dr.patch 
	consider-logical-partitions.patch 
	gvfs-1.4.0-mountspec-from-string.patch 
	gvfs-1.4.1-mtp-devices-mime.patch 
	gvfs-1.4.1-no-poll-for-media.patch 
	gvfs-1.4.1-separate-eject-safely-remove-drive.patch 
	gvfs-1.4.1-trash-dont-overwrite.patch obex-crasher.patch 
Log Message:
copy f12 changes


gvfs-1.4.2-handle-null-gdudevices.patch:
 ggduvolume.c        |  109 +++++++++++++++++++++++++++++++++++-----------------
 ggduvolumemonitor.c |   86 +++++++++++++++++++++++++++--------------
 2 files changed, 132 insertions(+), 63 deletions(-)

--- NEW FILE gvfs-1.4.2-handle-null-gdudevices.patch ---
>From 48cf9c174f347f92c3fab7ff50b38effda0eb78a Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 30 Oct 2009 17:06:26 +0000
Subject: Gently handle NULL GduDevice objects

This patch adds bunch of tests for NULL GduDevice objects. According to
gdu docs, there's a possibility to have GduPresentable and no associated
GduDevice. It's not common but true for several special cases -
like GduLinuxMdDrive.

Signed-off-by: David Zeuthen <davidz at redhat.com>
---

diff --git a/monitor/gdu/ggduvolume.c b/monitor/gdu/ggduvolume.c
index 865a7b7..28839fd 100644
--- a/monitor/gdu/ggduvolume.c
+++ b/monitor/gdu/ggduvolume.c
@@ -172,7 +172,7 @@ static gboolean
 update_volume (GGduVolume *volume)
 {
   GduDevice *device;
-  GduPool *pool;
+  GduPool *pool = NULL;
   time_t now;
   gboolean changed;
   gboolean old_can_mount;
@@ -217,10 +217,11 @@ update_volume (GGduVolume *volume)
 
   /* in with the new */
   device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
-  pool = gdu_device_get_pool (device);
+  if (device != NULL)
+    pool = gdu_device_get_pool (device);
 
   keep_cleartext_volume = FALSE;
-  if (gdu_device_is_luks (device))
+  if (device != NULL && gdu_device_is_luks (device))
     {
       const gchar *holder_objpath;
 
@@ -287,13 +288,17 @@ update_volume (GGduVolume *volume)
       volume->name = gdu_presentable_get_name (GDU_PRESENTABLE (volume->cleartext_gdu_volume));
 
       g_free (volume->device_file);
-      volume->device_file = g_strdup (gdu_device_get_device_file (luks_cleartext_volume_device));
+      if (luks_cleartext_volume_device != NULL)
+        volume->device_file = g_strdup (gdu_device_get_device_file (luks_cleartext_volume_device));
+      else
+        volume->device_file = NULL;
 
       volume->can_mount = TRUE;
 
       volume->should_automount = FALSE;
 
-      g_object_unref (luks_cleartext_volume_device);
+      if (luks_cleartext_volume_device != NULL)
+        g_object_unref (luks_cleartext_volume_device);
     }
   else
     {
@@ -321,7 +326,10 @@ update_volume (GGduVolume *volume)
         }
 
       g_free (volume->device_file);
-      volume->device_file = g_strdup (gdu_device_get_device_file (device));
+      if (device != NULL)
+        volume->device_file = g_strdup (gdu_device_get_device_file (device));
+      else
+        volume->device_file = NULL;
 
       volume->can_mount = TRUE;
 
@@ -341,14 +349,16 @@ update_volume (GGduVolume *volume)
        * nopolicy is only FALSE for "physical" devices - e.g. only "physical" devices will
        * be set to be automounted.
        */
-      if (gdu_device_get_presentation_nopolicy (device))
+      if (device != NULL && gdu_device_get_presentation_nopolicy (device))
         volume->should_automount = FALSE;
 
       g_free (activation_uri);
     }
 
-  g_object_unref (pool);
-  g_object_unref (device);
+  if (pool != NULL)
+    g_object_unref (pool);
+  if (device != NULL)
+    g_object_unref (device);
 
   /* ---------------------------------------------------------------------------------------------------- */
 
@@ -1082,6 +1092,20 @@ g_gdu_volume_mount (GVolume             *_volume,
     }
 
   device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
+
+  if (device == NULL)
+    {
+      simple = g_simple_async_result_new_error (G_OBJECT (volume),
+                                                callback,
+                                                user_data,
+                                                G_IO_ERROR,
+                                                G_IO_ERROR_FAILED,
+                                                "Underlying device missing");
+      g_simple_async_result_complete (simple);
+      g_object_unref (simple);
+      goto out;
+    }
+
   pool = gdu_device_get_pool (device);
 
   /* Makes no sense to mount
@@ -1129,11 +1153,14 @@ g_gdu_volume_mount (GVolume             *_volume,
 
       luks_cleartext_volume_device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->cleartext_gdu_volume));
 
-      object_path_of_cleartext_device = gdu_device_get_object_path (luks_cleartext_volume_device);
+      if (luks_cleartext_volume_device != NULL)
+        {
+          object_path_of_cleartext_device = gdu_device_get_object_path (luks_cleartext_volume_device);
 
-      mount_cleartext_device (data, object_path_of_cleartext_device);
+          mount_cleartext_device (data, object_path_of_cleartext_device);
 
-      g_object_unref (luks_cleartext_volume_device);
+          g_object_unref (luks_cleartext_volume_device);
+        }
       goto out;
     }
 
@@ -1551,17 +1578,20 @@ g_gdu_volume_get_identifier (GVolume     *_volume,
     {
       device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
 
-      label = gdu_device_id_get_label (device);
-      uuid = gdu_device_id_get_uuid (device);
+      if (device != NULL)
+        {
+          label = gdu_device_id_get_label (device);
+          uuid = gdu_device_id_get_uuid (device);
 
-      g_object_unref (device);
+          g_object_unref (device);
 
-      if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE) == 0)
-        id = g_strdup (volume->device_file);
-      else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_LABEL) == 0)
-        id = strlen (label) > 0 ? g_strdup (label) : NULL;
-      else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UUID) == 0)
-        id = strlen (uuid) > 0 ? g_strdup (uuid) : NULL;
+          if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE) == 0)
+            id = g_strdup (volume->device_file);
+          else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_LABEL) == 0)
+            id = strlen (label) > 0 ? g_strdup (label) : NULL;
+          else if (strcmp (kind, G_VOLUME_IDENTIFIER_KIND_UUID) == 0)
+            id = strlen (uuid) > 0 ? g_strdup (uuid) : NULL;
+        }
     }
 
   return id;
@@ -1577,19 +1607,24 @@ g_gdu_volume_enumerate_identifiers (GVolume *_volume)
   const gchar *uuid;
 
   p = g_ptr_array_new ();
+  label = NULL;
 
   if (volume->gdu_volume != NULL)
     {
       device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->gdu_volume));
-      label = gdu_device_id_get_label (device);
-      uuid = gdu_device_id_get_uuid (device);
-      g_object_unref (device);
-
-      g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE));
-      if (strlen (label) > 0)
-        g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_LABEL));
-      if (strlen (uuid) > 0)
-        g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UUID));
+
+      if (device != NULL)
+        {
+          label = gdu_device_id_get_label (device);
+          uuid = gdu_device_id_get_uuid (device);
+          g_object_unref (device);
+
+          g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE));
+          if (strlen (label) > 0)
+            g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_LABEL));
+          if (strlen (uuid) > 0)
+            g_ptr_array_add (p, g_strdup (G_VOLUME_IDENTIFIER_KIND_UUID));
+        }
     }
 
   g_ptr_array_add (p, NULL);
@@ -1638,8 +1673,11 @@ g_gdu_volume_has_device_file (GGduVolume   *volume,
     {
       GduDevice *luks_cleartext_volume_device;
       luks_cleartext_volume_device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->cleartext_gdu_volume));
-      _device_file = gdu_device_get_device_file (luks_cleartext_volume_device);
-      g_object_unref (luks_cleartext_volume_device);
+      if (luks_cleartext_volume_device != NULL)
+        {
+          _device_file = gdu_device_get_device_file (luks_cleartext_volume_device);
+          g_object_unref (luks_cleartext_volume_device);
+        }
     }
 
   return g_strcmp0 (_device_file, device_file) == 0;
@@ -1682,8 +1720,11 @@ g_gdu_volume_has_uuid (GGduVolume  *volume,
     {
       GduDevice *luks_cleartext_volume_device;
       luks_cleartext_volume_device = gdu_presentable_get_device (GDU_PRESENTABLE (volume->cleartext_gdu_volume));
-      _uuid = gdu_device_id_get_uuid (luks_cleartext_volume_device);
-      g_object_unref (luks_cleartext_volume_device);
+      if (luks_cleartext_volume_device != NULL)
+        {
+          _uuid = gdu_device_id_get_uuid (luks_cleartext_volume_device);
+          g_object_unref (luks_cleartext_volume_device);
+        }
     }
 
   return g_strcmp0 (_uuid, uuid) == 0;
diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index e81dce2..398fed4 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -779,9 +779,10 @@ should_volume_be_ignored (GduPool *pool, GduVolume *volume, GList *fstab_mount_p
   const gchar *type;
 
   ret = TRUE;
-  device = NULL;
 
   device = gdu_presentable_get_device (GDU_PRESENTABLE (volume));
+  if (device == NULL)
+    goto out;
 
   if (gdu_device_get_presentation_hide (device))
     goto out;
@@ -827,7 +828,8 @@ should_volume_be_ignored (GduPool *pool, GduVolume *volume, GList *fstab_mount_p
 
  out:
 
-  g_object_unref (device);
+  if (device != NULL)
+    g_object_unref (device);
   return ret;
 }
 
@@ -1269,15 +1271,18 @@ update_volumes (GGduVolumeMonitor *monitor,
 
       d = gdu_presentable_get_device (p);
 
-      volume = find_volume_for_device_file (monitor, gdu_device_get_device_file (d));
-      if (volume != NULL)
+      if (d != NULL)
         {
-          /*g_debug ("removing volume %s", gdu_device_get_device_file (d));*/
-          g_gdu_volume_removed (volume);
-          monitor->volumes = g_list_remove (monitor->volumes, volume);
-          *removed_volumes = g_list_prepend (*removed_volumes, volume);
+          volume = find_volume_for_device_file (monitor, gdu_device_get_device_file (d));
+          if (volume != NULL)
+            {
+              /*g_debug ("removing volume %s", gdu_device_get_device_file (d));*/
+              g_gdu_volume_removed (volume);
+              monitor->volumes = g_list_remove (monitor->volumes, volume);
+              *removed_volumes = g_list_prepend (*removed_volumes, volume);
+            }
+          g_object_unref (d);
         }
-      g_object_unref (d);
     }
 
   for (l = added; l != NULL; l = l->next)
@@ -1285,9 +1290,12 @@ update_volumes (GGduVolumeMonitor *monitor,
       GduPresentable *p = GDU_PRESENTABLE (l->data);
       GduDevice *d;
 
+      volume = NULL;
       d = gdu_presentable_get_device (p);
 
-      volume = find_volume_for_device_file (monitor, gdu_device_get_device_file (d));
+      if (d != NULL)
+        volume = find_volume_for_device_file (monitor, gdu_device_get_device_file (d));
+
       if (volume == NULL)
         {
           GduPresentable *toplevel_presentable;
@@ -1297,12 +1305,16 @@ update_volumes (GGduVolumeMonitor *monitor,
             {
               GduDevice *toplevel_device;
 
+              drive = NULL;
               toplevel_device = gdu_presentable_get_device (toplevel_presentable);
-              drive = find_drive_by_device_file (monitor, gdu_device_get_device_file (toplevel_device));
-              /*g_debug ("adding volume %s (drive %s)",
-                       gdu_device_get_device_file (d),
-                       gdu_device_get_device_file (toplevel_device));*/
-              g_object_unref (toplevel_device);
+              if (toplevel_device != NULL)
+                {
+                  drive = find_drive_by_device_file (monitor, gdu_device_get_device_file (toplevel_device));
+                  /*g_debug ("adding volume %s (drive %s)",
+                           gdu_device_get_device_file (d),
+                           gdu_device_get_device_file (toplevel_device));*/
+                  g_object_unref (toplevel_device);
+                }
               g_object_unref (toplevel_presentable);
             }
           else
@@ -1320,9 +1332,10 @@ update_volumes (GGduVolumeMonitor *monitor,
               monitor->volumes = g_list_prepend (monitor->volumes, volume);
               *added_volumes = g_list_prepend (*added_volumes, g_object_ref (volume));
             }
-        }
+         }
 
-      g_object_unref (d);
+       if (d != NULL)
+         g_object_unref (d);
     }
 
   g_list_free (added);
@@ -1579,10 +1592,15 @@ update_discs (GGduVolumeMonitor *monitor,
       GduPresentable *p = GDU_PRESENTABLE (l->data);
       GduDevice *d;
 
+      volume = NULL;
+      mount = NULL;
       d = gdu_presentable_get_device (p);
 
-      volume = find_disc_volume_for_device_file (monitor, gdu_device_get_device_file (d));
-      mount = find_disc_mount_for_volume (monitor, volume);
+      if (d != NULL)
+        {
+          volume = find_disc_volume_for_device_file (monitor, gdu_device_get_device_file (d));
+          mount = find_disc_mount_for_volume (monitor, volume);
+        }
 
       if (mount != NULL)
         {
@@ -1600,7 +1618,8 @@ update_discs (GGduVolumeMonitor *monitor,
           *removed_volumes = g_list_prepend (*removed_volumes, volume);
         }
 
-      g_object_unref (d);
+      if (d != NULL)
+        g_object_unref (d);
     }
 
   for (l = added; l != NULL; l = l->next)
@@ -1609,11 +1628,16 @@ update_discs (GGduVolumeMonitor *monitor,
       GduDevice *d;
       gboolean is_blank;
 
+      volume = NULL;
+      is_blank = TRUE;
       d = gdu_presentable_get_device (p);
 
-      is_blank = gdu_device_optical_disc_get_is_blank (d);
+      if (d != NULL)
+        {
+          is_blank = gdu_device_optical_disc_get_is_blank (d);
+          volume = find_disc_volume_for_device_file (monitor, gdu_device_get_device_file (d));
+        }
 
-      volume = find_disc_volume_for_device_file (monitor, gdu_device_get_device_file (d));
       if (volume == NULL)
         {
           GduPresentable *toplevel_presentable;
@@ -1623,12 +1647,16 @@ update_discs (GGduVolumeMonitor *monitor,
             {
               GduDevice *toplevel_device;
 
+              drive = NULL;
               toplevel_device = gdu_presentable_get_device (toplevel_presentable);
-              drive = find_drive_by_device_file (monitor, gdu_device_get_device_file (toplevel_device));
-              /*g_debug ("adding volume %s (drive %s)",
-                       gdu_device_get_device_file (d),
-                       gdu_device_get_device_file (toplevel_device));*/
-              g_object_unref (toplevel_device);
+              if (toplevel_device != NULL)
+                {
+                  drive = find_drive_by_device_file (monitor, gdu_device_get_device_file (toplevel_device));
+                  /*g_debug ("adding volume %s (drive %s)",
+                           gdu_device_get_device_file (d),
+                           gdu_device_get_device_file (toplevel_device));*/
+                  g_object_unref (toplevel_device);
+                }
               g_object_unref (toplevel_presentable);
             }
           else
@@ -1682,7 +1710,8 @@ update_discs (GGduVolumeMonitor *monitor,
             }
         }
 
-      g_object_unref (d);
+      if (d != NULL)
+        g_object_unref (d);
     }
 
   g_list_free (added);
--
cgit v0.8.2

gvfs-1.4.2-remove-dead-code.patch:
 ggduvolumemonitor.c |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

--- NEW FILE gvfs-1.4.2-remove-dead-code.patch ---
>From cd2afbd07bbcf4e7caee1dd0ca1c65d74974884d Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Fri, 30 Oct 2009 17:03:35 +0000
Subject: Remove dead code

Signed-off-by: David Zeuthen <davidz at redhat.com>
---
diff --git a/monitor/gdu/ggduvolumemonitor.c b/monitor/gdu/ggduvolumemonitor.c
index 83d8fc2..e81dce2 100644
--- a/monitor/gdu/ggduvolumemonitor.c
+++ b/monitor/gdu/ggduvolumemonitor.c
@@ -842,7 +842,6 @@ should_drive_be_ignored (GduPool *pool, GduDrive *d, GList *fstab_mount_points)
   GList *l;
 
   ignored = FALSE;
-  device = NULL;
   enclosed = NULL;
 
   device = gdu_presentable_get_device (GDU_PRESENTABLE (d));
@@ -1074,7 +1073,7 @@ find_disc_volume_for_device_file (GGduVolumeMonitor *monitor,
 
 static GGduVolume *
 find_volume_for_device_file (GGduVolumeMonitor *monitor,
-                            const gchar       *device_file)
+                             const gchar       *device_file)
 {
   GList *l;
   GGduVolume *ret;
@@ -1183,9 +1182,6 @@ update_drives (GGduVolumeMonitor *monitor,
   for (l = removed; l != NULL; l = l->next)
     {
       GduPresentable *p = GDU_PRESENTABLE (l->data);
-      GduDevice *d;
-
-      d = gdu_presentable_get_device (p);
 
       drive = find_drive_by_presentable (monitor, p);
       if (drive != NULL)
@@ -1195,16 +1191,11 @@ update_drives (GGduVolumeMonitor *monitor,
           monitor->drives = g_list_remove (monitor->drives, drive);
           *removed_drives = g_list_prepend (*removed_drives, drive);
         }
-      if (d != NULL)
-        g_object_unref (d);
     }
 
   for (l = added; l != NULL; l = l->next)
     {
       GduPresentable *p = GDU_PRESENTABLE (l->data);
-      GduDevice *d;
-
-      d = gdu_presentable_get_device (p);
 
       drive = find_drive_by_presentable (monitor, p);
       if (drive == NULL)
@@ -1217,8 +1208,6 @@ update_drives (GGduVolumeMonitor *monitor,
               *added_drives = g_list_prepend (*added_drives, g_object_ref (drive));
             }
         }
-      if (d != NULL)
-        g_object_unref (d);
     }
 
   g_list_free (added);
--
cgit v0.8.2

gvfs-1.4.2-smb-queryfs.patch:
 gvfsbackendsmb.c |   31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

--- NEW FILE gvfs-1.4.2-smb-queryfs.patch ---
>From 62f7058bec6f96c2dcc8a12431a1114e24eac6e8 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek at redhat.com>
Date: Tue, 10 Nov 2009 17:53:50 +0100
Subject: [PATCH] [SMB] Support querying filesystem size and free space

Requires libsmbclient >= 3.2.0

Fixes rfe bug 565337
---
 daemon/gvfsbackendsmb.c |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/daemon/gvfsbackendsmb.c b/daemon/gvfsbackendsmb.c
index bc8c415..2106a43 100644
--- a/daemon/gvfsbackendsmb.c
+++ b/daemon/gvfsbackendsmb.c
@@ -1591,8 +1591,36 @@ do_query_fs_info (GVfsBackend *backend,
 		  GFileInfo *info,
 		  GFileAttributeMatcher *attribute_matcher)
 {
+  GVfsBackendSmb *op_backend = G_VFS_BACKEND_SMB (backend);
+  smbc_statvfs_fn smbc_statvfs;
+  struct statvfs st = {0};
+  char *uri;
+  int res;
+
   g_file_info_set_attribute_string (info, G_FILE_ATTRIBUTE_FILESYSTEM_TYPE, "cifs");
-  
+
+#ifdef DEPRECATED_SMBC_INTERFACE
+  if (g_file_attribute_matcher_matches (attribute_matcher,
+					G_FILE_ATTRIBUTE_FILESYSTEM_SIZE) ||
+      g_file_attribute_matcher_matches (attribute_matcher,
+					G_FILE_ATTRIBUTE_FILESYSTEM_FREE) ||
+      g_file_attribute_matcher_matches (attribute_matcher,
+					G_FILE_ATTRIBUTE_FILESYSTEM_READONLY))
+    {
+      uri = create_smb_uri (op_backend->server, op_backend->share, filename);
+      smbc_statvfs = smbc_getFunctionStatVFS (op_backend->smb_context);
+      res = smbc_statvfs (op_backend->smb_context, uri, &st);
+      g_free (uri);
+
+      if (res == 0)
+        {
+          g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_SIZE, st.f_bsize * st.f_blocks);
+          g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_FILESYSTEM_FREE, st.f_bsize * st.f_bavail);
+          g_file_info_set_attribute_boolean (info, G_FILE_ATTRIBUTE_FILESYSTEM_READONLY, st.f_flag & SMBC_VFS_FEATURE_RDONLY);
+        }
+    }
+#endif
+
   g_vfs_job_succeeded (G_VFS_JOB (job));
 }
 
-- 
1.6.5.2



Index: gvfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -p -r1.162 -r1.163
--- gvfs.spec	12 Nov 2009 11:10:18 -0000	1.162
+++ gvfs.spec	12 Nov 2009 17:32:43 -0000	1.163
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.4.0
-Release: 9%{?dist}
+Version: 1.4.1
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -20,7 +20,7 @@ BuildRequires: gnome-keyring-devel
 BuildRequires: intltool
 BuildRequires: gettext-devel
 BuildRequires: GConf2-devel
-BuildRequires: gnome-disk-utility-devel >= 2.28.0
+BuildRequires: gnome-disk-utility-devel >= 2.28.1-1
 BuildRequires: PolicyKit-devel
 # This is a hack until the xfce4-notifyd dependency issue is fixed
 # https://fedorahosted.org/rel-eng/ticket/1788
@@ -39,26 +39,16 @@ Patch0: gvfs-archive-integration.patch
 Patch1: 0001-Add-AFC-backend.patch
 # from upstream
 Patch2: http-icons.patch
-# from upstream
-Patch3: consider-logical-partitions.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=526892
-# Nautilus not displaying friendly icons for SSH-connected system
-Patch4: gvfs-1.4.0-mountspec-from-string.patch
-# from upstream
-Patch5: gvfs-1.4.1-trash-dont-overwrite.patch
-Patch6: gvfs-1.4.1-separate-eject-safely-remove-drive.patch
-Patch7: gvfs-1.4.1-no-poll-for-media.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=520497
-# annoying error dialogs
-Patch8: 0001-Disallow-mounting-empty-drives.patch
-Patch9: 0002-Disallow-ejecting-empty-drives.patch
-Patch10: 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=528181
-Patch11: obex-crasher.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=565337
+Patch3: gvfs-1.4.2-smb-queryfs.patch
 # from upstream
 Patch12: gvfs-1.4.1-http-suport-stream-query-info.patch
 Patch13: gvfs-1.4.1-http-soup-header-parsing.patch
-Patch14: gvfs-1.4.1-mtp-devices-mime.patch
+Patch14: gvfs-1.4.2-remove-dead-code.patch
+Patch15: gvfs-1.4.2-handle-null-gdudevices.patch
+
+Obsoletes: gnome-mount <= 0.8
+Obsoletes: gnome-mount-nautilus-properties <= 0.8
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -154,18 +144,11 @@ and iPod Touches to applications using g
 %patch0 -p1 -b .archive-integration
 %patch1 -p1 -b .afc
 %patch2 -p1 -b .http-icons
-%patch3 -p1 -b .logical-partitions
-%patch4 -p1 -b .favicons
-%patch5 -p1 -b .trash-overwrite
-%patch6 -p1 -b .separate-eject
-%patch7 -p1 -b .no-poll
-%patch8 -p1 -b .mount-empty
-%patch9 -p1 -b .eject-empty
-%patch10 -p1 -b .error-detaching
-%patch11 -p1 -b .push-fail
+%patch3 -p1 -b .smb-queryfs
 %patch12 -p1 -b .http-query-info
 %patch13 -p1 -b .http-headers
-%patch14 -p1 -b .mtp-mime
+%patch14 -p1 -b .dead-code
+%patch15 -p1 -b .gdu-null-devices
 
 %build
 
@@ -331,12 +314,24 @@ killall -USR1 gvfsd >&/dev/null || :
 %{_datadir}/gvfs/remote-volume-monitors/afc.monitor
 
 %changelog
-* Thu Nov 12 2009 Bastien Nocera <bnocera at redhat.com> 1.4.0-9
+* Thu Nov 12 2009 Matthias Clasen <mclasen at redhat.com> 1.4.1-6
+- Add obsoletes for gnome-mount
+
+* Thu Nov 12 2009 Bastien Nocera <bnocera at redhat.com> 1.4.1-5
 - Add obsoletes for gnome-vfs2-obexftp
 
-* Mon Nov  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-8
+* Tue Nov 10 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.1-4
+- SMB: Support querying filesystem size and free space
+
+* Tue Nov  3 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.1-3
+- gdu-volume-monitor: don't crash on NULL devices (#529982)
+
+* Mon Nov  2 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.1-2
 - Reload .mount files when single package is installed
 
+* Tue Oct 20 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.1-1
+- Update to 1.4.1
+
 * Fri Oct 16 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-7
 - HTTP: Support g_file_input_stream_query_info()
 - HTTP: Use libsoup header parsing function
@@ -344,6 +339,8 @@ killall -USR1 gvfsd >&/dev/null || :
 
 * Wed Oct 14 2009 Bastien Nocera <bnocera at redhat.com> 1.4.0-6
 - Fix crasher in ObexFTP (#528181)
+
+* Fri Oct  9 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.4.0-5
 - Don't always overwrite on trash restore
 - Separate "Safely Remove Drive" from "Eject"
 - Don't advertise can_poll for drives not using removable media


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gvfs/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- sources	21 Sep 2009 14:50:35 -0000	1.48
+++ sources	12 Nov 2009 17:32:43 -0000	1.49
@@ -1 +1 @@
-5c5086763873bbc6239af84722bf1afe  gvfs-1.4.0.tar.bz2
+6eff809d50e618f289d5192724a049de  gvfs-1.4.1.tar.bz2


--- 0001-Disallow-mounting-empty-drives.patch DELETED ---


--- 0002-Disallow-ejecting-empty-drives.patch DELETED ---


--- 0003-Silently-drop-eject-error-messages-when-detaching-dr.patch DELETED ---


--- consider-logical-partitions.patch DELETED ---


--- gvfs-1.4.0-mountspec-from-string.patch DELETED ---


--- gvfs-1.4.1-mtp-devices-mime.patch DELETED ---


--- gvfs-1.4.1-no-poll-for-media.patch DELETED ---


--- gvfs-1.4.1-separate-eject-safely-remove-drive.patch DELETED ---


--- gvfs-1.4.1-trash-dont-overwrite.patch DELETED ---


--- obex-crasher.patch DELETED ---


