--- a/ChangeLog	Wed Aug 20 13:39:12 2003 +0000
+++ b/ChangeLog	Wed Aug 20 13:48:36 2003 +0000
@@ -1,3 +1,9 @@
+2003-08-20 Niall Power - <[email protected]>
+
+	* gnome-vfs.spec: add gnome-vfs-21-fix-nfs-writes.diff
+	* patches/gnome-vfs-21-fix-nfs-writes.diff BT#4908786
+	Patch fixes file copy to nfs:// URI data corruption.
+
 2003-08-20 Erwann Chenede - <[email protected]>
 
 	* blueprint.spec : bumped version.

--- a/gnome-vfs.spec	Wed Aug 20 13:39:12 2003 +0000
+++ b/gnome-vfs.spec	Wed Aug 20 13:48:36 2003 +0000
@@ -2,7 +2,7 @@
 License:      LGPL
 Group:        System/Libraries/GNOME
 Version:      2.2.5
-Release:      7
+Release:      8
 Distribution: Mercury
 Vendor:       Sun Microsystems, Inc.
 Summary:      Virtual File System Library for GNOME
@@ -28,6 +28,7 @@
 Patch18:      gnome-vfs-18-vfolder-permissions.diff
 Patch19:      gnome-vfs-19-system-settings-vfolder.diff
 Patch20:      gnome-vfs-20-extras-menu.diff
+Patch21:      gnome-vfs-21-fix-nfs-writes.diff
 
 URL:          http://www.gnome.org/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -92,6 +93,7 @@
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 tar jxvf %SOURCE1
 
@@ -150,6 +152,10 @@
 %{_datadir}/gtk-doc/html/gnome-vfs-2.0
 
 %changelog
+* Wed Aug 20 2003 - [email protected]
+- Added patch 21 (not the one Stephen removed :)
+  Fixes broken nfs write method.
+
 * Tue Aug 19 2003 - [email protected]
 - Removed patch 21 its totally broken
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-vfs-21-fix-nfs-writes.diff	Wed Aug 20 13:48:36 2003 +0000
@@ -0,0 +1,11 @@
+--- gnome-vfs-2.2.5/modules/nfs-method.c	2003-08-20 14:24:19.000000000 +0100
++++ gnome-vfs-2.2.5.new/modules/nfs-method.c	2003-08-20 14:29:18.000000000 +0100
+@@ -1595,7 +1595,7 @@
+ 
+ 	if (bytes_written)
+ 		*bytes_written = num_bytes;
+-	
++	h->position += num_bytes;
+ 	return GNOME_VFS_OK;
+ }
+