[gvfs/f14/master] 1.6.4

[Matthias Clasen]

commit 9fcbda80698520009dc84567e0820addfe86d229
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Sep 29 07:01:26 2010 -0400

    1.6.4

 .gitignore |    1 +
 gvfs.spec  |   17 +++++------------
 sources    |    2 +-
 3 files changed, 7 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57a9f24..0d3016b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gvfs-1.6.3.tar.bz2
+/gvfs-1.6.4.tar.bz2
diff --git a/gvfs.spec b/gvfs.spec
index 6fb6025..8f2c70c 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.6.3
-Release: 3%{?dist}
+Version: 1.6.4
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -40,14 +40,6 @@ Patch0: gvfs-archive-integration.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=552856
 Patch15: gvfs-1.5.1-gphoto2-no-storageinfo-support.patch
 
-# If you delete an empty folder with an emblem, and then try to open your trash nautilus hangs
-# https://bugzilla.gnome.org/show_bug.cgi?id=614544
-Patch16: gvfs-1.6.2-stringv-dbus.patch
-
-# from upstream
-# https://bugzilla.gnome.org/show_bug.cgi?id=628889
-Patch17: gvfs-1.6.4-gconf-deadlock.patch
-
 Obsoletes: gnome-mount <= 0.8
 Obsoletes: gnome-mount-nautilus-properties <= 0.8
 
@@ -145,8 +137,6 @@ including phones and music players to applications using gvfs.
 %setup -q
 %patch0 -p1 -b .archive-integration
 %patch15 -p1 -b .gphoto2-storageinfo
-%patch16 -p1 -b .stringv-dbus
-%patch17 -p1 -b .gconf-daemons
 
 %build
 
@@ -316,6 +306,9 @@ killall -USR1 gvfsd >&/dev/null || :
 %endif
 
 %changelog
+* Wed Sep 29 2010 Matthias Clasen <mclasen at redhat.com> - 1.6.4-1
+- Update to 1.6.4
+
 * Wed Sep  8 2010 Tomas Bzatek <tbzatek at redhat.com> - 1.6.3-3
 - Fix smb daemons deadlock due to GConf initialization
 
diff --git a/sources b/sources
index cf5b855..f2a4446 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c2e76b6c7c7ed603bab05753f971f82  gvfs-1.6.3.tar.bz2
+2edf08b7c4531d5dfae39e30adb12d18  gvfs-1.6.4.tar.bz2