[samba/f17] Update to 3.6.10
Guenther Deschner
gd at fedoraproject.org
Mon Dec 10 19:05:29 UTC 2012
commit b28875b494b01841d0dd652ce3b6a152a17e5abe
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 10 20:03:44 2012 +0100
Update to 3.6.10
Guenther
.gitignore | 1 +
samba-3.6.9-fix_pam_winbind_crash.patch | 34 -------------------------------
samba.spec | 9 ++++---
sources | 2 +-
4 files changed, 7 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9321e67..937efe2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ samba-3.6.0pre1.tar.gz
/samba-3.6.7.tar.gz
/samba-3.6.8.tar.gz
/samba-3.6.9.tar.bz2
+/samba-3.6.10.tar.bz2
diff --git a/samba.spec b/samba.spec
index 887e65b..eea32af 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,5 +1,5 @@
-%define main_release 96
-%define samba_version 3.6.9
+%define main_release 97
+%define samba_version 3.6.10
%define tdb_version 1.2.9
%define talloc_version 2.0.5
#%define pre_release rc3
@@ -46,7 +46,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.9-fix_pam_winbind_crash.patch
Requires(pre): samba-common = %{epoch}:%{samba_version}-%{release}
Requires: pam >= 0:0.64
@@ -232,7 +231,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 .pam_winbind_crash
mv %samba_source/VERSION %samba_source/VERSION.orig
sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{samba_release}\"/' < %samba_source/VERSION.orig > %samba_source/VERSION
@@ -698,6 +696,9 @@ fi
%{_datadir}/pixmaps/samba/logo-small.png
%changelog
+* Mon Dec 10 2012 Guenther Deschner <gdeschner at redhat.com> - 2:3.6.10-97
+- Update to 3.6.10
+
* Fri Nov 09 2012 Guenther Deschner <gdeschner at redhat.com> - 2:3.6.9-96
- Update to 3.6.9
diff --git a/sources b/sources
index b126e8c..f46dcc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5b6a8400eae16720daaaa57411b870f6 samba-3.6.9.tar.bz2
+9771c98882d645fde355847c2b748465 samba-3.6.10.tar.bz2
More information about the scm-commits
mailing list