[gvfs/f20] Update to 1.18.4

[Ondrej Holy]

commit 4c2bb7b82e4675fd8a1eb44b6e94119af09562e1
Author: Ondrej Holy <oholy at redhat.com>
Date:   Tue Nov 11 10:42:24 2014 +0100

    Update to 1.18.4

 .gitignore |    1 +
 gvfs.spec  |   12 +++++-------
 sources    |    2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 51c2745..88595e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,4 @@ gvfs-1.6.3.tar.bz2
 /gvfs-1.18.1.tar.xz
 /gvfs-1.18.2.tar.xz
 /gvfs-1.18.3.tar.xz
+/gvfs-1.18.4.tar.xz
diff --git a/gvfs.spec b/gvfs.spec
index 5302fb3..2a1e99e 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -2,8 +2,8 @@
 
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.18.3
-Release: 3%{?dist}
+Version: 1.18.4
+Release: 1%{?dist}
 License: GPLv3 and LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -41,10 +41,6 @@ BuildRequires: libtool
 # http://bugzilla.gnome.org/show_bug.cgi?id=567235
 Patch0: gvfs-archive-integration.patch
 
-# Upstream patch to fix mtp crashes during unmount
-# https://bugzilla.gnome.org/show_bug.cgi?id=715119
-Patch1: 0001-MTP-Fail-fast-if-in-the-middle-of-an-unmount.patch
-
 Obsoletes: gnome-mount <= 0.8
 Obsoletes: gnome-mount-nautilus-properties <= 0.8
 Obsoletes: gvfs-obexftp < 1.17.91-2
@@ -166,7 +162,6 @@ file services.
 %prep
 %setup -q
 %patch0 -p1 -b .archive-integration
-%patch1 -p1 -b .fix-mtp-crashes
 
 # Needed for gvfs-0.2.1-archive-integration.patch
 libtoolize --force  || :
@@ -363,6 +358,9 @@ update-desktop-database >&/dev/null || :
 %{_datadir}/gvfs/remote-volume-monitors/goa.monitor
 
 %changelog
+* Tue Nov 11 2014 Ondrej Holy <oholy at redhat.com> - 1.18.4-1
+- Update to 1.18.4
+
 * Wed Jul 30 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.18.3-3
 - Rebuild for libimobiledevice for iOS7
 
diff --git a/sources b/sources
index 64b68cc..25b7fc7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3620baa478f1748bd32d2f47bcbe30d0  gvfs-1.18.3.tar.xz
+44b3a8ef69567660b950fe45270d956e  gvfs-1.18.4.tar.xz