From 59f45f8514766a735f82e7b2e39de4d4c8709ea6 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@fedoraproject.org>
Date: Mar 16 2009 12:46:05 +0000
Subject: - Update to 1.2.0


---

diff --git a/.cvsignore b/.cvsignore
index 46ca7a0..6f5e21f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gvfs-1.1.8.tar.bz2
+gvfs-1.2.0.tar.bz2
diff --git a/gvfs-1.1.8-monitor-leaks.patch b/gvfs-1.1.8-monitor-leaks.patch
deleted file mode 100644
index 100a13c..0000000
--- a/gvfs-1.1.8-monitor-leaks.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: client/gdaemonfilemonitor.c
-===================================================================
---- client/gdaemonfilemonitor.c	(revision 2316)
-+++ client/gdaemonfilemonitor.c	(revision 2317)
-@@ -202,6 +202,9 @@
- 				  G_VFS_DBUS_MONITOR_INTERFACE,
- 				  G_VFS_DBUS_MONITOR_OP_UNSUBSCRIBE);
- 
-+  _g_dbus_message_append_args (message, DBUS_TYPE_OBJECT_PATH,
-+			       &daemon_monitor->object_path, 0);
-+  
-   _g_vfs_daemon_call_async (message,
- 			    NULL, NULL, 
- 			    NULL);
diff --git a/gvfs-1.1.8-sftp-cpu-eating.patch b/gvfs-1.1.8-sftp-cpu-eating.patch
deleted file mode 100644
index e65b64f..0000000
--- a/gvfs-1.1.8-sftp-cpu-eating.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: daemon/gvfsbackendsftp.c
-===================================================================
---- daemon/gvfsbackendsftp.c	(revision 2315)
-+++ daemon/gvfsbackendsftp.c	(revision 2316)
-@@ -560,6 +560,15 @@
- 				&bytes_read, NULL, error))
-     return NULL;
- 
-+  /* Make sure we handle ssh exiting early, e.g. if no further
-+     authentication methods */
-+  if (bytes_read == 0)
-+    {
-+      g_set_error_literal (error,
-+			   G_IO_ERROR, G_IO_ERROR_FAILED,
-+			   _("ssh program unexpectedly exited"));
-+      return NULL;
-+    }
-   
-   len = GUINT32_FROM_BE (len);
-   
diff --git a/gvfs.spec b/gvfs.spec
index 970c556..67e1e16 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -1,11 +1,11 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
-Version: 1.1.8
-Release: 2%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
-Source: http://download.gnome.org/sources/gvfs/1.1/gvfs-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gvfs/1.2/gvfs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig
 BuildRequires: glib2-devel >= 2.19.2
@@ -40,11 +40,6 @@ Patch3: gvfs-1.1.7-gdu-monitor-empty-drives.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=573826
 Patch4: gvfs-1.1.7-gdu-computer-expose-devices.patch
 
-# http://bugzilla.gnome.org/show_bug.cgi?id=574754
-Patch5: gvfs-1.1.8-sftp-cpu-eating.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=563418
-Patch6: gvfs-1.1.8-monitor-leaks.patch
 
 %description
 The gvfs package provides backend implementations for the gio
@@ -130,8 +125,6 @@ media players (Media Transfer Protocol) to applications using gvfs.
 %patch2 -p0 -b .gdu
 %patch3 -p1 -b .gdu-volumes-typo
 %patch4 -p1 -b .computer-gdu
-%patch5 -p0 -b .sftp-100-cpu
-%patch6 -p0 -b .monitor-leaks
 
 %build
 
@@ -275,6 +268,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Mon Mar 16 2009 Tomas Bzatek <tbzatek@redhat.com> - 1.2.0-1
+- Update to 1.2.0
+
 * Wed Mar 11 2009 Tomas Bzatek <tbzatek@redhat.com> - 1.1.8-2
 - Fix 100% cpu usage when connecting to a ssh key and denying key access
 - Fix monitors leak
diff --git a/sources b/sources
index a479d1b..fda6fac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7936ae0cbef86b6c1cd74d7ebb87c9ba  gvfs-1.1.8.tar.bz2
+d30aa7b099e4a3746da81265d27363da  gvfs-1.2.0.tar.bz2