From 6257a9827d3246c1c61612c086cb8a08017d5fb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@fedoraproject.org>
Date: Wed, 13 Apr 2011 12:24:41 +0200
Subject: [PATCH] Update to 3.6.0pre2

Guenther
---
 .gitignore            |  1 +
 samba-3.6.0pre2.patch | 26 ++++++++++++++++++++++++++
 samba.spec            | 12 +++++++++---
 sources               |  2 +-
 4 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 samba-3.6.0pre2.patch

diff --git a/.gitignore b/.gitignore
index 53a8f3d..8cfcf15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 samba-3.5.4.tar.gz
 samba-3.6.0pre1.tar.gz
+/samba-3.6.0pre2.tar.gz
diff --git a/samba-3.6.0pre2.patch b/samba-3.6.0pre2.patch
new file mode 100644
index 0000000..32aeb42
--- /dev/null
+++ b/samba-3.6.0pre2.patch
@@ -0,0 +1,26 @@
+From 6e482682528445659d05574c2bd37b8730e35ce5 Mon Sep 17 00:00:00 2001
+From: Michael Adam <obnox@samba.org>
+Date: Mon, 4 Apr 2011 11:46:31 +0200
+Subject: [PATCH] s3:idmap_tdb2: fix build of tdb2
+
+The include of system/filesys.h was removed from includes.h. ...
+(cherry picked from commit b7e330a2b325463e49abceb8f3e8d792248179ed)
+---
+ source3/winbindd/idmap_tdb2.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
+index 82121f8..1a5a51a 100644
+--- a/source3/winbindd/idmap_tdb2.c
++++ b/source3/winbindd/idmap_tdb2.c
+@@ -32,6 +32,7 @@
+ */
+ 
+ #include "includes.h"
++#include "system/filesys.h"
+ #include "winbindd.h"
+ #include "idmap.h"
+ #include "idmap_rw.h"
+-- 
+1.7.4.2
+
diff --git a/samba.spec b/samba.spec
index 1f5358e..6d0230f 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,9 +1,9 @@
-%define main_release 65
+%define main_release 66
 %define samba_version 3.6.0
 %define tdb_version 1.2.1
 %define talloc_version 2.0.1
 #%define pre_release %nil
-%define pre_release pre1
+%define pre_release pre2
 
 %define samba_release %{main_release}%{pre_release}%{?dist}
 
@@ -45,6 +45,7 @@ Patch104: samba-3.0.0rc3-nmbd-netbiosname.patch
 # The passwd part has been applied, but not the group part
 Patch107: samba-3.2.0pre1-grouppwd.patch
 Patch200: samba-3.2.5-inotify.patch
+Patch201: samba-3.6.0pre2.patch
 
 Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
 Requires: pam >= 0:0.64
@@ -210,6 +211,7 @@ cp %{SOURCE11} packaging/Fedora/
 #%patch104 -p1 -b .nmbd-netbiosname # FIXME: does not apply
 %patch107 -p1 -b .grouppwd
 %patch200 -p0 -b .inotify
+%patch201 -p1 -b .buildfix
 
 mv %samba_source/VERSION %samba_source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
@@ -411,6 +413,7 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/cifs.upcall
 rm -f $RPM_BUILD_ROOT%{_bindir}/tdbbackup
 rm -f $RPM_BUILD_ROOT%{_bindir}/tdbdump
 rm -f $RPM_BUILD_ROOT%{_bindir}/tdbtool
+rm -f $RPM_BUILD_ROOT%{_bindir}/tdbrestore
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbbackup.8*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbdump.8*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man8/tdbtool.8*
@@ -624,7 +627,7 @@ exit 0
 %files doc
 %defattr(-,root,root)
 %doc docs/Samba3-Developers-Guide.pdf docs/Samba3-ByExample.pdf
-%doc docs/Samba3-HOWTO.pdf
+#%doc docs/Samba3-HOWTO.pdf
 %doc docs/htmldocs
 
 %files -n libsmbclient
@@ -651,6 +654,9 @@ exit 0
 %{_datadir}/pixmaps/samba/logo-small.png
 
 %changelog
+* Wed Apr 13 2011 Guenther Deschner <gdeschner@redhat.com> - 3.6.0pre2-66
+- Update to 3.6.0pre2
+
 * Fri Mar 11 2011 Guenther Deschner <gdeschner@redhat.com> - 3.6.0pre1-65
 - Enable quota support
 
diff --git a/sources b/sources
index c473ceb..ca7b4d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3ab8c47f955a38f0d542d7a45d233cd9  samba-3.6.0pre1.tar.gz
+012c945aba7079960991b5d81bb36747  samba-3.6.0pre2.tar.gz