From 8cbf88ab668eb064d3c608a91f8aa82fd4080a6e Mon Sep 17 00:00:00 2001
From: "Tom \"spot\" Callaway" <tcallawa@redhat.com>
Date: Mon, 11 Oct 2010 16:44:19 -0400
Subject: [PATCH] 2010.10.2

---
 .gitignore   |  1 +
 ntfs-3g.spec | 11 +++++------
 sources      |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 675a889..8f1096d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 ntfs-3g-2010.6.31-RC.tgz
 ntfs-3g-2010.8.8.tgz
+/ntfs-3g-2010.10.2.tgz
diff --git a/ntfs-3g.spec b/ntfs-3g.spec
index e0e2898..407fb29 100644
--- a/ntfs-3g.spec
+++ b/ntfs-3g.spec
@@ -7,14 +7,12 @@
 
 Name:		ntfs-3g
 Summary:	Linux NTFS userspace driver
-Version:	2010.8.8
-Release:	2%{?dist}
+Version:	2010.10.2
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 Source0:	http://tuxera.com/opensource/ntfs-3g-%{version}%{?subver}.tgz
 Source1:	20-ntfs-config-write-policy.fdi
-Patch0:		ntfs-3g-1.2216-nomtab.patch
-Patch1:		ntfs-3g-2010.8.8-context-mount-option.patch
 URL:		http://www.ntfs-3g.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if %{with_externalfuse}
@@ -50,8 +48,6 @@ functionality.
 
 %prep
 %setup -q -n %{name}-%{version}%{?subver}
-%patch0 -p1 -b .nomtab
-%patch1 -p1 -b .context
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64"
@@ -136,6 +132,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libntfs-3g.pc
 
 %changelog
+* Mon Oct 11 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2:2010.10.2-1
+- update to 2010.10.2, all patches merged upstream
+
 * Thu Sep  9 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 2:2010.8.8-2
 - add support for context= mount option (Till Maas) (bz502946)
 
diff --git a/sources b/sources
index b78f450..54ee193 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c109746c2708f679725a2ea441c61c6  ntfs-3g-2010.8.8.tgz
+91405690f25822142cdcb43d03e62d3f  ntfs-3g-2010.10.2.tgz