From 612227913feb3c9bcbae659982d1b9a25b12f5636d79a26e517b66f592b315d1 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Fri, 2 Sep 2011 00:10:13 +0000
Subject: [PATCH] Accepting request 80431 from
 home:vuntz:branches:GNOME:Factory

Update to 1.9.4

OBS-URL: https://build.opensuse.org/request/show/80431
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gvfs?expand=0&rev=115
---
 gvfs-1.9.3.tar.bz2 |  3 ---
 gvfs-1.9.4.tar.bz2 |  3 +++
 gvfs-nvvfs.patch   |  4 ++--
 gvfs.changes       | 19 +++++++++++++++++++
 gvfs.spec          |  7 ++++++-
 5 files changed, 30 insertions(+), 6 deletions(-)
 delete mode 100644 gvfs-1.9.3.tar.bz2
 create mode 100644 gvfs-1.9.4.tar.bz2

diff --git a/gvfs-1.9.3.tar.bz2 b/gvfs-1.9.3.tar.bz2
deleted file mode 100644
index 824762a..0000000
--- a/gvfs-1.9.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da3607fed3b9e41f899a56fd794c5cc0cc5572e46afbc4b83ce5cb1846c4ca1e
-size 1449674
diff --git a/gvfs-1.9.4.tar.bz2 b/gvfs-1.9.4.tar.bz2
new file mode 100644
index 0000000..f04d619
--- /dev/null
+++ b/gvfs-1.9.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a131ad9ff38f6ab1100a3d97b4a37bc3a203076d7c7008ba326d98682605f0b4
+size 1507329
diff --git a/gvfs-nvvfs.patch b/gvfs-nvvfs.patch
index bcd971f..e6b897d 100644
--- a/gvfs-nvvfs.patch
+++ b/gvfs-nvvfs.patch
@@ -653,8 +653,8 @@ Index: gvfs-1.5.1/daemon/Makefile.am
 ===================================================================
 --- gvfs-1.5.1.orig/daemon/Makefile.am
 +++ gvfs-1.5.1/daemon/Makefile.am
-@@ -108,6 +108,10 @@ mount_DATA += afc.mount
- libexec_PROGRAMS += gvfsd-afc
+@@ -108,6 +108,10 @@ mount_DATA += afp-browse.mount afp.mount
+ libexec_PROGRAMS += gvfsd-afp-browse gvfsd-afp
  endif
  
 +mount_in_files += nvvfs.mount.in
diff --git a/gvfs.changes b/gvfs.changes
index 3370591..d96ed4c 100644
--- a/gvfs.changes
+++ b/gvfs.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Wed Aug 31 16:25:58 CEST 2011 - vuntz@opensuse.org
+
+- Update to version 1.9.4:
+  + Brand new AFP backend
+  + Fixed several leaks of GSimpleAsyncResult objects
+  + Added simple gvfs-mime test application
+  + daemon: Ignore SIGPIPE signals to avoid process termination on
+    cancelled transfer
+  + computer: Use 'drive-harddisk-system' as File System icon
+  + ftp: Fix return value of try_get_settable_attributes() on
+    failure
+  + gvfs-open: Exit with error code > 0 when open fails
+  + String tweaks
+  + Updated translations.
+- Add libgcrypt-devel BuildRequires: new dependency for the AFP
+  backend.
+- Rebase gvfs-nvvfs.patch.
+
 -------------------------------------------------------------------
 Mon Aug 15 19:37:07 CEST 2011 - dimstar@opensuse.org
 
diff --git a/gvfs.spec b/gvfs.spec
index dd03321..882cfe9 100644
--- a/gvfs.spec
+++ b/gvfs.spec
@@ -18,7 +18,7 @@
 
 
 Name:           gvfs
-Version:        1.9.3
+Version:        1.9.4
 Release:        1
 # FIXME: add libbluray BuildRequires once available (fate#312440)
 License:        LGPLv2.0+
@@ -40,6 +40,7 @@ BuildRequires:  libarchive-devel
 BuildRequires:  libavahi-glib-devel
 BuildRequires:  libcdio-devel
 BuildRequires:  libexpat-devel
+BuildRequires:  libgcrypt-devel
 BuildRequires:  libgdu-devel
 BuildRequires:  libgnome-keyring-devel
 BuildRequires:  libgphoto2-devel
@@ -191,6 +192,10 @@ rm -rf %{buildroot}
 %{_libexecdir}/%{name}/gvfs-gphoto2-volume-monitor
 %{_datadir}/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
 %{_datadir}/%{name}/remote-volume-monitors/gphoto2.monitor
+%{_libexecdir}/%{name}/gvfsd-afp
+%{_datadir}/%{name}/mounts/afp.mount
+%{_libexecdir}/%{name}/gvfsd-afp-browse
+%{_datadir}/%{name}/mounts/afp-browse.mount
 %{_libexecdir}/%{name}/gvfsd-archive
 %{_datadir}/%{name}/mounts/archive.mount
 %{_libexecdir}/%{name}/gvfsd-burn