diff --git a/.gitignore b/.gitignore index 8cfcf15..bf155f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ samba-3.5.4.tar.gz samba-3.6.0pre1.tar.gz /samba-3.6.0pre2.tar.gz +/samba-3.6.0pre3.tar.gz diff --git a/samba-3.6.0pre2.patch b/samba-3.6.0pre2.patch deleted file mode 100644 index 32aeb42..0000000 --- a/samba-3.6.0pre2.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6e482682528445659d05574c2bd37b8730e35ce5 Mon Sep 17 00:00:00 2001 -From: Michael Adam -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 6d0230f..62cdb32 100644 --- a/samba.spec +++ b/samba.spec @@ -1,9 +1,9 @@ -%define main_release 66 +%define main_release 67 %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 pre2 +%define pre_release pre3 %define samba_release %{main_release}%{pre_release}%{?dist} @@ -45,7 +45,6 @@ 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 @@ -211,7 +210,6 @@ 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 @@ -627,7 +625,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 @@ -654,6 +652,9 @@ exit 0 %{_datadir}/pixmaps/samba/logo-small.png %changelog +* Wed Apr 27 2011 Guenther Deschner - 3.6.0pre3-67 +- Update to 3.6.0pre3 + * Wed Apr 13 2011 Guenther Deschner - 3.6.0pre2-66 - Update to 3.6.0pre2 diff --git a/sources b/sources index ca7b4d8..27408d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -012c945aba7079960991b5d81bb36747 samba-3.6.0pre2.tar.gz +48526c5545162be3a5850841c80fed58 samba-3.6.0pre3.tar.gz