From 0585c30ada29bb1b42fd7cce22e93fecc37c5342 Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@fedoraproject.org>
Date: May 30 2008 20:05:30 +0000
Subject: Updating to upstream version v0.6


---

diff --git a/.cvsignore b/.cvsignore
index 3213921..c5b219b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 fuse-s3fs-0.4.tbz2
 fuse-s3fs-0.5.tbz2
+fuse-s3fs-0.6.tbz2
diff --git a/fuse-s3fs-0.4-ftruncate.patch b/fuse-s3fs-0.4-ftruncate.patch
deleted file mode 100644
index db4ad11..0000000
--- a/fuse-s3fs-0.4-ftruncate.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up fuse-s3fs-0.4/src/s3fs.orig fuse-s3fs-0.4/src/s3fs
---- fuse-s3fs-0.4/src/s3fs.orig	2008-04-05 21:36:25.000000000 -0400
-+++ fuse-s3fs-0.4/src/s3fs	2008-04-05 21:36:34.000000000 -0400
-@@ -771,7 +771,7 @@ class S3File(object):
- 
- 	def ftruncate(self, len):
- 		self.file.truncate(len)
--		self.node.stat.st_size = 0
-+		self.node.stat.st_size = len 
- 		return
- 
- """
diff --git a/fuse-s3fs-0.4-noargs.patch b/fuse-s3fs-0.4-noargs.patch
deleted file mode 100644
index c16e59e..0000000
--- a/fuse-s3fs-0.4-noargs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Steven Harms <thisdyingdream@gmail.com>
-Date: Thu, 24 Apr 2008 12:05:23 +0000 (-0400)
-Subject: Updating main routine to not dump a backtrace if no args are specified
-X-Git-Url: http://git.fedorahosted.org/git/s3fs?p=s3fs.git;a=commitdiff_plain;h=916b0644e9c5fba9348dcc8f19ae5f729ef09e18
-
-Updating main routine to not dump a backtrace if no args are specified
----
-
-diff --git a/src/s3fs b/src/s3fs
-index 12bf1f2..dc65c80 100755
---- a/src/s3fs
-+++ b/src/s3fs
-@@ -1284,7 +1284,7 @@ def main():
- 	fs.main()	
- 
- if __name__ == '__main__':
--	if sys.argv[1] == "-h":
-+	if len(sys.argv) == 1 or sys.argv[1] == "-h":
- 		s3fs_usage()
- 		sys.exit(0)
- 	if sys.argv[1] == "-C":
diff --git a/fuse-s3fs.spec b/fuse-s3fs.spec
index b1eaeb1..61137e0 100644
--- a/fuse-s3fs.spec
+++ b/fuse-s3fs.spec
@@ -1,5 +1,5 @@
 Name:		fuse-s3fs 
-Version:	0.5
+Version:	0.6
 Release:	1%{?dist}
 Summary:	FUSE filesystem using Amazon Simple Storage Service as storage
 Group:		System Environment/Base
@@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Fri May 30 2008 Neil Horman <nhorman@tuxdriver.com> 0.6-1
+- Updated s3fs to upstream version 0.6
+
 * Fri May 16 2008 Neil Horman <nhorman@tuxdriver.com> 0.5-1
 - Updated s3fs to upstream version 0.5
 
diff --git a/sources b/sources
index 56e5679..13e0efd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0fedf1bdb66baa9c545522a56a8c3852  fuse-s3fs-0.5.tbz2
+2cc3f37f214f3169261999fb989461ba  fuse-s3fs-0.6.tbz2