diff --git a/build-source-timestamp b/build-source-timestamp
index 4c51387..46351d5 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1 @@
-2851
-Branch      : 3.6.9
+SOURCE_TIMESTAMP="2905"
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index ecf7e3b..ab7e2a4 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ccd8b0c67806f439428db83bbefc6eb6d17d654a67f80169dd8b96a0744561b9
-size 33795
+oid sha256:d5e3e511d3bf039aa5d91bc96fdebe3991e70fe7ebcad005c5d09748f9f20ffb
+size 34080
diff --git a/samba-3.6.10.tar.bz2 b/samba-3.6.10.tar.bz2
new file mode 100644
index 0000000..783fe9c
--- /dev/null
+++ b/samba-3.6.10.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:088a47f77e45475f679bbccf715e126375e2fe490011e86c63e32ee7a24e26d1
+size 29484832
diff --git a/samba-3.6.9.tar.bz2 b/samba-3.6.9.tar.bz2
deleted file mode 100644
index 7be29bc..0000000
--- a/samba-3.6.9.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2334793a8cce439638499754ffaee3dad04417cdcd50bc653715157af480e68b
-size 29486630
diff --git a/samba-doc.spec b/samba-doc.spec
index 8dea0cb..bdf8cae 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -17,7 +17,6 @@
 
 # norootforbuild
 
-
 Name:           samba-doc
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
 BuildRequires:  autoconf
@@ -51,15 +50,11 @@ BuildRequires:  python-devel
 %endif
 %if 0%{?suse_version} > 930 && 0%{?suse_version} < 1031
 BuildRequires:  dmapi-devel
-BuildRequires:  libnscd-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  mysql-devel
 BuildRequires:  postgresql-devel
 BuildRequires:  xfsprogs-devel
 %endif
-%if 0%{?suse_version} > 830 && 0%{?suse_version} < 931
-BuildRequires:  heimdal-devel
-%endif
 %if 0%{?fedora_version}
 BuildRequires:  cracklib-devel
 %endif
@@ -81,10 +76,11 @@ BuildRequires:  ctdb-devel > 1.0.105
 BuildRequires:  fdupes
 %endif
 %if 0%{?suse_version} > 1020
-BuildRequires:  pkg-config
+%define pkgconfig_req pkg-config
 %else
-BuildRequires:  pkgconfig
+%define pkgconfig_req pkgconfig
 %endif
+BuildRequires:  %{pkgconfig_req}
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210
 BuildRequires:  libldb-devel
 #!BuildIgnore: libtalloc
@@ -93,12 +89,25 @@ BuildRequires:  libtalloc-devel
 BuildRequires:  libtdb-devel
 BuildRequires:  libtevent-devel
 %endif
-%define	samba_ver 3.6.9
+%define	samba_ver 3.6.10
 %define	samba_ver_suffix %nil
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
 %define	guards_symbols pre_1111
 %endif
+%if 0%{?suse_version} && 0%{?suse_version} < 1031
+%define libsmbclient_name libsmbclient
+%define libsmbsharemodes_name libsmbsharemodes
+%else
+%define libsmbclient_name libsmbclient0
+%define libsmbsharemodes_name libsmbsharemodes0
+%endif
+%define libldb_name libldb1
+%define libnetapi_name libnetapi0
+%define libwbclient_name libwbclient0
+%define libtalloc_name libtalloc2
+%define libtdb_name libtdb1
+%define libtevent_name libtevent0
 %if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211
 %define	libldb_ver 1.0.2
 %define	libtalloc_ver 2.0.5
@@ -117,8 +126,10 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        3.6.9
-Release:        1
+%define SOURCE_TIMESTAMP 2905
+%define BRANCH %{version}
+Version:        3.6.10
+Release:        0
 %define	ldapsmb_ver 1.34b
 Url:            http://www.samba.org/
 License:        GPL-3.0+
@@ -199,7 +210,6 @@ BuildRequires:  ccache
 %define cups_lib_dir %{_libdir}/cups
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 %prep
 # samba-doc nowadays is part the main samba spec file
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
@@ -447,7 +457,6 @@ fi
 
 # samba-doc nowadays is part the main samba spec file
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
-
 %files -f filelist-samba-doc
 %defattr(-,root,root)
 %dir %{DOCDIR}
@@ -461,8 +470,9 @@ fi
 This package contains all the Samba documentation as it is not part of
 the man pages.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %changelog
diff --git a/samba.changes b/samba.changes
index 681deb7..9a9d368 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,7 +1,107 @@
 -------------------------------------------------------------------
-Wed Oct 31 16:48:12 UTC 2012 - lmuelle@suse.com
+Wed Jan  9 21:53:11 UTC 2013 - lmuelle@suse.com
 
-- Only execute the run_permissions macro on pre-12.3 systems.
+- Add the missing get_printing_ticket binary path while calling the
+  set_permissions macro; (bnc#783375).
+
+-------------------------------------------------------------------
+Sun Dec 23 14:56:51 UTC 2012 - lmuelle@suse.com
+
+- Use the version macro while definition of the branch macro.
+
+-------------------------------------------------------------------
+Mon Dec 10 22:25:04 UTC 2012 - lmuelle@suse.com
+
+- SEGV when using second vfs module; (bso#9471).
+
+-------------------------------------------------------------------
+Mon Dec 10 11:24:52 UTC 2012 - lmuelle@suse.com
+
+- Update to 3.6.10.
+  + Respond correctly to FILE_STREAM_INFO requests; (bso#9460).
+  + Fix segfault when "default devmode" is disabled; (bso#9433).
+  + Fix segfaults in "log level = 10" on Solaris; (bso#9390).
+
+-------------------------------------------------------------------
+Sat Dec  8 18:57:16 UTC 2012 - lmuelle@suse.com
+
+- Fix MD5 detection in the autoconf build; (bso#9037); (bso#9086); (bso#9094);
+  (bso#9418).
+- Use work around for 'winbind use default domain' only if it is set;
+  (bso#9367).
+- Allow smb2.acls torture test to pass against smbd with a POSIX ACLs backend;
+  (bso#9374).
+- large read requests cause server to issue malformed reply; (bso#9422).
+- s3-rpc_client: lookup nametype 0x20 in rpc_pipe_open_tcp_port(); (bso#9426).
+- Fix ncacn_ip_tcp reconnection code for lsa lookups; (bso#9439).
+- Allow to force DNS updates using net; (bso#9451).
+- Respond correctly to FILE_STREAM_INFO requests; (bso#9460).
+
+-------------------------------------------------------------------
+Tue Dec  4 14:29:48 UTC 2012 - lmuelle@suse.com
+
+- On uninstall remove winbind from the pam configuration, invalidate the nscd
+  passwd and group cache and only recommend the install of nscd; (bnc#792340).
+
+-------------------------------------------------------------------
+Mon Dec  3 16:43:51 UTC 2012 - lmuelle@suse.com
+
+- BuildRequire libnscd-devel once.
+
+-------------------------------------------------------------------
+Sun Dec  2 21:47:01 UTC 2012 - lmuelle@suse.com
+
+- Remove obsoleted references to pre-9.4 SUSE systems; (bnc#792294).
+- Add SUSE version depending pkg-config requires macro; (bnc#792294).
+
+-------------------------------------------------------------------
+Sun Dec  2 15:14:37 UTC 2012 - lmuelle@suse.com
+
+- Define library names and use it instead of libldb1, libnetapi0,
+  libsmbclient0, libsmbsharemodes0, libtalloc2, libtdb1, libtevent0, and
+  libwbclient0; (bnc#792294).
+- Provide and obsolete libsmbsharemodes for post-10.3 SUSE systems.
+
+-------------------------------------------------------------------
+Fri Nov 30 18:14:37 UTC 2012 - lmuelle@suse.com
+
+- Don't clutter the spec file diff view; (bnc#783384).
+
+-------------------------------------------------------------------
+Wed Nov 28 13:08:20 UTC 2012 - jmcdonough@suse.com
+
+- Fix fd leak causing 100% CPU in winbind on certain dc connection 
+  failures; (bso#9436); (bnc#786677).
+
+-------------------------------------------------------------------
+Tue Nov 27 17:22:58 UTC 2012 - ddiss@suse.com
+
+- Fix spoolss segfault when default devmode is disabled; (bso#9433);
+  (bnc#791183).
+
+-------------------------------------------------------------------
+Fri Nov 16 18:23:42 UTC 2012 - lmuelle@suse.com
+
+- ACL masks incorrectly applied when setting ACLs; (bso#9236).
+- s3-kerberos: also try with AES keys, when decrypting tickets; (bso#9272).
+- lib/replace: replace all *printf function if we replace snprintf; (bso#9390).
+- lib/addns: don't depend on the order in resp->answers[]; (bso#9402).
+
+-------------------------------------------------------------------
+Tue Nov 13 17:26:15 UTC 2012 - lmuelle@suse.com
+
+- s4:torture/smb2: improve the smb2.create.blob tes; (bso#9209).
+- lib/krb5_wrap: request enc_types in the correct order; (bso#9272).
+- Fix net ads join message for the dns domain; (bso#9326).
+- docs-xml: fix use of <smbconfoption> tag; (bso#9345).
+- s3-aio_pthread: Optimize aio_pthread_handle_completion; (bso#9359).
+- s3:winbind: Failover if netlogon pipe is not available; (bso#9386).
+
+-------------------------------------------------------------------
+Thu Nov  1 20:26:19 UTC 2012 - lmuelle@suse.com
+
+- Execute the run_permissions macro on pre-11.4 systems and else the
+  set_permission one if available.
 
 -------------------------------------------------------------------
 Mon Oct 29 19:48:51 UTC 2012 - lmuelle@suse.com
@@ -30,7 +130,7 @@ Mon Oct 29 12:03:21 UTC 2012 - lmuelle@suse.com
 - Fix wrong test == syntax in configure; (bso#8146).
 - Fix --with(out)-sendfile-support option handling in autoconf; (bso#8344).
 - Fix builtin forms order to match Windows again; (bso#8632).
-- Fix RAW printing for normal users; (bso#8769).
+- Fix RAW printing for normal users; (bso#8769); (bnc#790741).
 - Initialise ticket to ensure we do not invalid memory; (bso#8788).
 - Fix 'net rpc share allowedusers' to work with 2008r2; (bso#8966).
 - Fix crash on null pam change pw response; (bso#9013).
@@ -47,7 +147,7 @@ Mon Oct 29 12:03:21 UTC 2012 - lmuelle@suse.com
 - Empty SPNEGO packet can cause smbd to crash; (bso#9174).
 - pam_winbind: Match more return codes when wbcGetPwnam has failed;
   (bso#9177).
-- Fix crash bug in idmap_hash; (bso#9188).
+- Fix crash bug in idmap_hash; (bso#9188); (bnc#788159).
 - SMB2 Create doesn't return correct MAX ACCESS access mask in blob;
   (bso#9189).
 - Fix service control for non-internal services; (bso#9192).
@@ -133,7 +233,7 @@ Thu Aug 16 14:18:35 UTC 2012 - lmuelle@suse.com
 Mon Aug  6 20:41:15 UTC 2012 - lmuelle@suse.com
 
 - Update to 3.6.7.
-  + Fix resolving our own "Domain Local" groups; (bso#9052).
+  + Fix resolving our own "Domain Local" groups; (bso#9052); (bnc#779269).
   + Fix migrating printers while upgrading from 3.5.x; (bso#9026).
 
 -------------------------------------------------------------------
@@ -153,7 +253,7 @@ Mon Aug  6 19:40:23 UTC 2012 - lmuelle@suse.com
   (bso#9034).
 - Using asynchronous IO with SMB2 can return NT_STATUS_FILE_CLOSED in error
   instead ofNT_STATUS_FILE_LOCK_CONFLICT; (bso#9040).
-- Fix resolving our own "Domain Local" groups; (bso#9052).
+- Fix resolving our own "Domain Local" groups; (bso#9052); (bnc#779269).
 - Fix build against CUPS 1.6; (bso#9055).
 - Fix bugs in SMB2 credit handling code; (bso#9057).
 - rpcclient: Fix bad call to data_blob_const; (bso#9062).
@@ -179,14 +279,14 @@ Mon Jun 25 19:46:31 UTC 2012 - lmuelle@suse.com
 - Update to 3.6.6.
   + Fix possible memory leaks in the Samba master process; (bso#8970).
   + Fix uninitialized memory read in talloc_free(); (bnc#764577).
-  + Fix joining of XP Pro workstations to 3.6 DCs; (bso#8373).
+  + Fix joining of XP Pro workstations to 3.6 DCs; (bso#8373); (bnc#787983).
 
 -------------------------------------------------------------------
 Thu Jun 21 18:05:33 UTC 2012 - lmuelle@suse.com
 
 - resolve_ads() code can return zero addresses and miss valid DC IP addresses;
   (bso#8910).
-- Can't join XP Pro workstations to 3.6.1 DC; (bso#8373).
+- Can't join XP Pro workstations to 3.6.1 DC; (bso#8373); (bnc#787983).
 - winbind can hang as nbt_getdc() has no timeout; (bso#8953).
 - Fix crash bug in dns_create_probe when dns_create_update fails; (bso#8627)
 - s3-pid: Catch with pid filename's change when config file is not smb.conf;
diff --git a/samba.spec b/samba.spec
index c63c0e4..57de28c 100644
--- a/samba.spec
+++ b/samba.spec
@@ -17,7 +17,6 @@
 
 # norootforbuild
 
-
 Name:           samba
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
 BuildRequires:  autoconf
@@ -51,15 +50,11 @@ BuildRequires:  python-devel
 %endif
 %if 0%{?suse_version} > 930 && 0%{?suse_version} < 1031
 BuildRequires:  dmapi-devel
-BuildRequires:  libnscd-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  mysql-devel
 BuildRequires:  postgresql-devel
 BuildRequires:  xfsprogs-devel
 %endif
-%if 0%{?suse_version} > 830 && 0%{?suse_version} < 931
-BuildRequires:  heimdal-devel
-%endif
 %if 0%{?fedora_version}
 BuildRequires:  cracklib-devel
 %endif
@@ -81,10 +76,11 @@ BuildRequires:  ctdb-devel > 1.0.105
 BuildRequires:  fdupes
 %endif
 %if 0%{?suse_version} > 1020
-BuildRequires:  pkg-config
+%define pkgconfig_req pkg-config
 %else
-BuildRequires:  pkgconfig
+%define pkgconfig_req pkgconfig
 %endif
+BuildRequires:  %{pkgconfig_req}
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210
 BuildRequires:  libldb-devel
 #!BuildIgnore: libtalloc
@@ -93,12 +89,25 @@ BuildRequires:  libtalloc-devel
 BuildRequires:  libtdb-devel
 BuildRequires:  libtevent-devel
 %endif
-%define	samba_ver 3.6.9
+%define	samba_ver 3.6.10
 %define	samba_ver_suffix %nil
 %define	samba_ver_full %{samba_ver}%{samba_ver_suffix}
 %if 0%{?suse_version} && 0%{?suse_version} < 1111
 %define	guards_symbols pre_1111
 %endif
+%if 0%{?suse_version} && 0%{?suse_version} < 1031
+%define libsmbclient_name libsmbclient
+%define libsmbsharemodes_name libsmbsharemodes
+%else
+%define libsmbclient_name libsmbclient0
+%define libsmbsharemodes_name libsmbsharemodes0
+%endif
+%define libldb_name libldb1
+%define libnetapi_name libnetapi0
+%define libwbclient_name libwbclient0
+%define libtalloc_name libtalloc2
+%define libtdb_name libtdb1
+%define libtevent_name libtevent0
 %if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211
 %define	libldb_ver 1.0.2
 %define	libtalloc_ver 2.0.5
@@ -117,8 +126,10 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        3.6.9
-Release:        1
+%define SOURCE_TIMESTAMP 2905
+%define BRANCH %{version}
+Version:        3.6.10
+Release:        0
 %define	ldapsmb_ver 1.34b
 License:        GPL-3.0+
 Url:            http://www.samba.org/
@@ -223,9 +234,9 @@ Samba as part of SUSE Linux Enterprise or openSUSE products, links to
 binary packages of the most current Samba version, and a bug reporting
 how to.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %package client
 License:        GPL-3.0+
@@ -264,12 +275,11 @@ Samba as part of SUSE Linux Enterprise or openSUSE products, links to
 binary packages of the most current Samba version, and a bug reporting
 how to.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
-
 %package devel
 License:        GPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with Samba Support
@@ -284,9 +294,9 @@ Obsoletes:      samba-devel-64bit
 This package contains the static libraries and header files needed to
 develop programs which make use of Samba.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %endif
 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
@@ -309,9 +319,9 @@ BuildArch:      noarch
 This package contains all the Samba documentation as it is not part of
 the man pages.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %endif
 
@@ -330,14 +340,13 @@ Requires:       samba-client >= %{version}
 %description krb-printing
 A wrapper binary to run smbspool with the original calling UID.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %if %{make_utils}
 
 %package utils
-
 Summary:        debug tools
 Group:          Productivity/Networking/Samba
 Provides:       samba-gplv3-utils = %{version}
@@ -346,9 +355,9 @@ Obsoletes:      samba-gplv3-utils < %{version}
 %description utils
 Some of the debug-tools for developpers.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %endif
 
@@ -363,12 +372,15 @@ Provides:       samba-client:/usr/sbin/winbindd
 Obsoletes:      samba-winbind-64bit
 %endif
 Requires:       samba-client >= %{version}
+%if 0%{?suse_version}
+Requires:       pam-config
+%endif
 %if 0%{?suse_version} > 1030
 Recommends:     cron
 Recommends:     logrotate
 Recommends:     samba-krb-printing
+Recommends:     /usr/sbin/nscd
 %endif
-PreReq:         /etc/init.d/nscd
 %if 0%{?suse_version} > 0
 PreReq:         %{?insserv_prereq}
 %endif
@@ -379,19 +391,13 @@ PreReq:         coreutils
 %description winbind
 This is the winbind-daemon and the wbinfo-tool.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
-
-%if 0%{?suse_version} && 0%{?suse_version} < 1031
-
-%package -n libsmbclient
-License:        GPL-3.0+
-%else
-
-%package -n libsmbclient0
 
+%package -n %{libsmbclient_name}
 License:        GPL-3.0+
+%if 0%{?suse_version} > 1030
 Provides:       libsmbclient = %{version}
 Obsoletes:      libsmbclient
 %endif
@@ -402,21 +408,7 @@ Summary:        Samba Client Library
 Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
-%if 0%{?suse_version} && 0%{?suse_version} < 1031
-
-%description -n libsmbclient
-
-Source Timestamp: 2851
-Branch      : 3.6.9
-
-%else
-
-%description -n libsmbclient0
-
-Source Timestamp: 2851
-Branch      : 3.6.9
-
-%endif
+%description -n %{libsmbclient_name}
 This package includes the libsmbclient library.
 
 libsmbclient is provided by the libsmbclient0 package.
@@ -425,297 +417,237 @@ This entry is required to allow a samba.spec file providing
 libsmbclient for SUSE version < 11.0 while versions > 10.0 will have
 libsmbclient0.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
+
 %package -n libsmbclient-devel
 License:        GPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with smbclient Support
 Group:          Development/Libraries/C and C++
-%if 0%{?suse_version} > 1020
-BuildRequires:  pkg-config
-%else
-BuildRequires:  pkgconfig
-%endif
-%if 0%{?suse_version} && 0%{?suse_version} < 921
-Requires:       heimdal-devel
-Requires:       libsmbclient = %{version}
-%else
-%if 0%{?suse_version} && 0%{?suse_version} < 1031
+BuildRequires:  %{pkgconfig_req}
 Requires:       krb5-devel
-Requires:       libsmbclient = %{version}
-%else
-Requires:       krb5-devel
-Requires:       libsmbclient0 = %{version}
-%endif
-%endif
+Requires:       %{libsmbclient_name} = %{version}
 
 %description -n libsmbclient-devel
 This package contains the static libraries and header files needed to
 develop programs which make use of the smbclient programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
-%package -n libnetapi0
+%package -n %{libnetapi_name}
 License:        GPL-3.0+
 Summary:        Samba netapi Library
 Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
-%description -n libnetapi0
+%description -n %{libnetapi_name}
 This package includes the netapi library.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %package -n libnetapi-devel
 License:        GPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with netapi Support
 Group:          Development/Libraries/C and C++
-%if 0%{?suse_version} > 1020
-BuildRequires:  pkg-config
-%else
-BuildRequires:  pkgconfig
-%endif
-Requires:       libnetapi0 = %{version}
+BuildRequires:  %{pkgconfig_req}
+Requires:       %{libnetapi_name} = %{version}
 
 %description -n libnetapi-devel
 This package contains the static libraries and header files needed to
 develop programs which make use of the netapi programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
-
-%if 0%{?suse_version} && 0%{?suse_version} < 1031
-
-%package -n libsmbsharemodes
-License:        GPL-3.0+
-%else
-
-%package -n libsmbsharemodes0
 
+%package -n %{libsmbsharemodes_name}
 License:        GPL-3.0+
+%if 0%{?suse_version} > 1030
+Provides:       libsmbsharemodes = %{version}
+Obsoletes:      libsmbsharemodes
 %endif
 Summary:        Samba smbsharemodes Library
 Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
-%if 0%{?suse_version} && 0%{?suse_version} < 1031
-
-%description -n libsmbsharemodes
-
-Source Timestamp: 2851
-Branch      : 3.6.9
-
-%else
-
-%description -n libsmbsharemodes0
-
-Source Timestamp: 2851
-Branch      : 3.6.9
-
-%endif
+%description -n %{libsmbsharemodes_name}
 This package includes the smbsharemodes library.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
+
+
 %package -n libsmbsharemodes-devel
 License:        GPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with smbsharemodes Support
 Group:          Development/Libraries/C and C++
-%if 0%{?suse_version} > 1020
-BuildRequires:  pkg-config
-%else
-BuildRequires:  pkgconfig
-%endif
-%if 0%{?suse_version} && 0%{?suse_version} < 1031
-Requires:       libsmbsharemodes = %{version}
-%else
-Requires:       libsmbsharemodes0 = %{version}
-%endif
+BuildRequires:  %{pkgconfig_req}
+Requires:       %{libsmbsharemodes_name} = %{version}
 
 %description -n libsmbsharemodes-devel
 This package contains the static libraries and header files needed to
 develop programs which make use of the smbsharemodes programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
-%package -n libwbclient0
+%package -n %{libwbclient_name}
 License:        LGPL-3.0+
 Summary:        Samba libwbclient Library
 Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
-%description -n libwbclient0
+%description -n %{libwbclient_name}
 This package includes the wbclient library.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %package -n libwbclient-devel
 License:        LGPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with wbclient Support
 Group:          Development/Libraries/C and C++
-%if 0%{?suse_version} > 1020
-BuildRequires:  pkg-config
-%else
-BuildRequires:  pkgconfig
-%endif
-Requires:       libwbclient0 = %{version}
+BuildRequires:  %{pkgconfig_req}
+Requires:       %{libwbclient_name} = %{version}
 
 %description -n libwbclient-devel
 This package contains the static libraries and header files needed to
 develop programs which make use of the wbclient programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1211
 
-%package -n libtalloc2
+%package -n %{libtalloc_name}
 Version:        %{libtalloc_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Samba talloc Library
 Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
-%description -n libtalloc2
+%description -n %{libtalloc_name}
 This package includes the talloc library.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %package -n libtalloc-devel
 Version:        %{libtalloc_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with talloc Support
 Group:          Development/Libraries/C and C++
-%if 0%{?suse_version} > 1020
-BuildRequires:  pkg-config
-%else
-BuildRequires:  pkgconfig
-%endif
-Requires:       libtalloc2 = %{libtalloc_ver}
+BuildRequires:  %{pkgconfig_req}
+Requires:       %{libtalloc_name} = %{libtalloc_ver}
 
 %description -n libtalloc-devel
 This package contains the static libraries and header files needed to
 develop programs which make use of the talloc programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
-%package -n libtdb1
+%package -n %{libtdb_name}
 Version:        %{libtdb_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Samba tdb Library
 Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
-%description -n libtdb1
+%description -n %{libtdb_name}
 This package includes the tdb library.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %package -n libtdb-devel
 Version:        %{libtdb_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with tdb Support
 Group:          Development/Libraries/C and C++
-#BuildRequires:  pkg-config
-Requires:       libtdb1 = %{libtdb_ver}
+#BuildRequires:  %{pkgconfig_req}
+Requires:       %{libtdb_name} = %{libtdb_ver}
 
 %description -n libtdb-devel
 This package contains the static libraries and header files needed to
 develop programs which make use of the tdb programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
-%package -n libtevent0
+%package -n %{libtevent_name}
 Version:        %{libtevent_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Samba tevent Library
 Group:          System/Libraries
 PreReq:         /sbin/ldconfig
 
-%description -n libtevent0
+%description -n %{libtevent_name}
 This package includes the tevent library.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %package -n libtevent-devel
 Version:        %{libtevent_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with tevent Support
 Group:          Development/Libraries/C and C++
-%if 0%{?suse_version} > 1020
-BuildRequires:  pkg-config
-%else
-BuildRequires:  pkgconfig
-%endif
+BuildRequires:  %{pkgconfig_req}
 Requires:       libtalloc-devel
-Requires:       libtevent0 = %{libtevent_ver}
+Requires:       %{libtevent_name} = %{libtevent_ver}
 
 %description -n libtevent-devel
 This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
-%package -n libldb1
+%package -n %{libldb_name}
 Version:        %{libldb_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Samba ldb Library
 Group:          System/Libraries
 BuildRequires:  popt-devel
 PreReq:         /sbin/ldconfig
 
-%description -n libldb1
+%description -n %{libldb_name}
 This package includes the ldb library.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %package -n libldb-devel
 Version:        %{libldb_ver}
-Release:        5
 License:        LGPL-3.0+
 Summary:        Libraries and Header Files to Develop Programs with ldb Support
 Group:          Development/Libraries/C and C++
-%if 0%{?suse_version} > 1020
-BuildRequires:  pkg-config
-%else
-BuildRequires:  pkgconfig
-%endif
-Requires:       libldb1 = %{libldb_ver}
+BuildRequires:  %{pkgconfig_req}
+Requires:       %{libldb_name} = %{libldb_ver}
 Requires:       libtalloc-devel
 
 %description -n libldb-devel
 This package contains the static libraries and header files needed to
 develop programs which make use of the tevent programming interface.
 
-Source Timestamp: 2851
-Branch      : 3.6.9
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
 %endif
 
@@ -723,7 +655,7 @@ Branch      : 3.6.9
 
 %package -n ldapsmb
 Version:        1.34b
-Release:        307
+Release:        0
 License:        GPL-2.0+
 Summary:        Tool to administer Samba's LDAP backend
 Group:          Productivity/Networking/Samba
@@ -733,9 +665,9 @@ Requires:       perl-ldap
 This tool aims to simplify the administration of a Samba Domain
 Controller that uses the ldapsam passdb backend.
 
+Source timestamp: %{SOURCE_TIMESTAMP}
+Branch:         %{BRANCH}
 
-Source Timestamp: 2851
-Branch      : 3.6.9
 
 %endif
 
@@ -1101,11 +1033,7 @@ install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf
 touch %{buildroot}/var/run/%{cifs_init_script}
 install -m 0644 config/swat.xinetd %{buildroot}/%{_sysconfdir}/xinetd.d/swat
 install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg
-%if 0%{?suse_version} && 0%{?suse_version} < 921
-	install -m 0644 config/samba.pamd %{buildroot}/%{_sysconfdir}/pam.d/samba
-%else
-	install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba
-%endif
+install -m 0644 config/samba.pamd-common %{buildroot}/%{_sysconfdir}/pam.d/samba
 install -m 0644 config/dhcp.conf %{buildroot}/%{_var}/adm/fillup-templates/samba-client-dhcp.conf
 install -m 0644 config/sysconfig.dhcp-samba-client %{buildroot}/%{_var}/adm/fillup-templates/sysconfig.dhcp-samba-client
 for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd %{cifs_init_script}; do
@@ -1327,35 +1255,31 @@ fi
 /sbin/ldconfig
 %{?insserv_cleanup:%{insserv_cleanup}}
 
-%post -n libnetapi0 -p /sbin/ldconfig
+%post -n %{libnetapi_name} -p /sbin/ldconfig
 
-%postun -n libnetapi0 -p /sbin/ldconfig
+%postun -n %{libnetapi_name} -p /sbin/ldconfig
+
+%post -n %{libwbclient_name} -p /sbin/ldconfig
+
+%postun -n %{libwbclient_name} -p /sbin/ldconfig
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1211
 
-%post -n libtalloc2 -p /sbin/ldconfig
+%post -n %{libtalloc_name} -p /sbin/ldconfig
 
-%postun -n libtalloc2 -p /sbin/ldconfig
+%postun -n %{libtalloc_name} -p /sbin/ldconfig
 
-%endif
+%post -n %{libtdb_name} -p /sbin/ldconfig
 
-%post -n libwbclient0 -p /sbin/ldconfig
+%postun -n %{libtdb_name} -p /sbin/ldconfig
 
-%postun -n libwbclient0 -p /sbin/ldconfig
+%post -n %{libtevent_name} -p /sbin/ldconfig
 
-%if 0%{?suse_version} && 0%{?suse_version} < 1211
+%postun -n %{libtevent_name} -p /sbin/ldconfig
 
-%post -n libtdb1 -p /sbin/ldconfig
+%post -n %{libldb_name} -p /sbin/ldconfig
 
-%postun -n libtdb1 -p /sbin/ldconfig
-
-%post -n libtevent0 -p /sbin/ldconfig
-
-%postun -n libtevent0 -p /sbin/ldconfig
-
-%post -n libldb1 -p /sbin/ldconfig
-
-%postun -n libldb1 -p /sbin/ldconfig
+%postun -n %{libldb_name} -p /sbin/ldconfig
 
 %endif
 
@@ -1379,8 +1303,12 @@ fi
 if test ${1:-0} -eq 1 -a -d %{cups_lib_dir}/backend; then
 	ln -fs %{_bindir}/get_printing_ticket %{cups_lib_dir}/backend/smb
 fi
-%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1221
-%{?run_permissions:%{run_permissions}}
+%if 0%{?suse_version} > 0
+%if 0%{?suse_version} < 1131
+%{run_permissions}
+%else
+%{set_permissions} %{_bindir}/get_printing_ticket
+%endif
 %endif
 
 %postun krb-printing
@@ -1416,44 +1344,25 @@ fi
 
 %postun winbind
 /sbin/ldconfig
-%{?restart_on_update:%{restart_on_update nscd winbind}}
+%if 0%{?suse_version}
+if [ $1 -eq 0 ]; then
+%{_sbindir}/pam-config --delete --winbind
+if [ -x %{_sbindir}/nscd ]; then
+	%{_sbindir}/nscd -i passwd
+	%{_sbindir}/nscd -i group
+fi
+fi
+%endif
+%{?restart_on_update:%{restart_on_update winbind}}
 %{?insserv_cleanup:%{insserv_cleanup}}
 
-%if 0%{?suse_version} && 0%{?suse_version} < 1031
+%post -n %{libsmbclient_name} -p /sbin/ldconfig
 
-%post -n libsmbclient
-%else
+%postun -n %{libsmbclient_name} -p /sbin/ldconfig
 
-%post -n libsmbclient0
-%endif
-/sbin/ldconfig
+%post -n %{libsmbsharemodes_name} -p /sbin/ldconfig
 
-%if 0%{?suse_version} && 0%{?suse_version} < 1031
-
-%postun -n libsmbclient
-%else
-
-%postun -n libsmbclient0
-%endif
-/sbin/ldconfig
-
-%if 0%{?suse_version} && 0%{?suse_version} < 1031
-
-%post -n libsmbsharemodes
-%else
-
-%post -n libsmbsharemodes0
-%endif
-/sbin/ldconfig
-
-%if 0%{?suse_version} && 0%{?suse_version} < 1031
-
-%postun -n libsmbsharemodes
-%else
-
-%postun -n libsmbsharemodes0
-%endif
-/sbin/ldconfig
+%postun -n %{libsmbsharemodes_name} -p /sbin/ldconfig
 
 %clean
 [ x"%{buildroot}" = x"/" ] && ( echo "your buildroot is /" && exit 0) || rm -rf "%{buildroot}"
@@ -1739,7 +1648,7 @@ fi
 %dir %{cups_lib_dir}/backend
 %ghost %{cups_lib_dir}/backend/smb
 
-%files -n libnetapi0
+%files -n %{libnetapi_name}
 %defattr(-,root,root)
 %{_libdir}/libnetapi.so.*
 
@@ -1752,13 +1661,7 @@ fi
 %{_libdir}/libnetapi.so
 %{_libdir}/pkgconfig/netapi.pc
 
-%if 0%{?suse_version} && 0%{?suse_version} < 1031
-
-%files -n libsmbclient
-%else
-
-%files -n libsmbclient0
-%endif
+%files -n %{libsmbclient_name}
 %defattr(-,root,root)
 %{_libdir}/libsmbclient.so.*
 %doc %{_mandir}/man7/libsmbclient.7.*
@@ -1772,13 +1675,7 @@ fi
 %{_libdir}/libsmbclient.so
 %{_libdir}/pkgconfig/smbclient.pc
 
-%if 0%{?suse_version} && 0%{?suse_version} < 1031
-
-%files -n libsmbsharemodes
-%else
-
-%files -n libsmbsharemodes0
-%endif
+%files -n %{libsmbsharemodes_name}
 %defattr(-,root,root)
 %{_libdir}/libsmbsharemodes.so.*
 
@@ -1793,7 +1690,7 @@ fi
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1211
 
-%files -n libtalloc2
+%files -n %{libtalloc_name}
 %defattr(-,root,root)
 %{_libdir}/libpytalloc-util.so.*
 %{_libdir}/libtalloc.so.*
@@ -1810,7 +1707,7 @@ fi
 %{_libdir}/pkgconfig/pytalloc-util.pc
 %{_libdir}/pkgconfig/talloc.pc
 
-%files -n libtdb1
+%files -n %{libtdb_name}
 %defattr(-,root,root)
 %{_libdir}/libtdb.so.*
 
@@ -1825,7 +1722,7 @@ fi
 
 %endif
 
-%files -n libwbclient0
+%files -n %{libwbclient_name}
 %defattr(-,root,root)
 %{_libdir}/libwbclient.so.*
 
@@ -1839,7 +1736,7 @@ fi
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1211
 
-%files -n libtevent0
+%files -n %{libtevent_name}
 %defattr(-,root,root)
 %{_libdir}/libtevent.so.*
 
@@ -1849,7 +1746,7 @@ fi
 %{_libdir}/libtevent.so
 %{_libdir}/pkgconfig/tevent.pc
 
-%files -n libldb1
+%files -n %{libldb_name}
 %defattr(-,root,root)
 %{_libdir}/libldb.so.*
 %dir %{_libdir}/ldb
@@ -1874,4 +1771,5 @@ fi
 %{_sbindir}/ldapsmb
 %{_mandir}/man5/ldapsmb.5.*
 %endif
+
 %changelog
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 0892653..6ab1440 100644
--- a/vendor-files.tar.bz2
+++ b/vendor-files.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72b349c61801c05dde9475de0dbd151320bc5c1bdf7fc4abd78d7b8fbfcce48f
-size 53392
+oid sha256:5b78afc2d3007c175a06efb80f5f66a579bec28dcb51e5e8bab84a17468d01a0
+size 53487