From dbcf114b68f9fad41049fcf535dd3f1f90904e824260a27cd12241673c00da17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Wed, 6 Feb 2013 15:56:00 +0000
Subject: [PATCH 1/6] Do not restart the smbfs service on pre-11.3 systems
 during dhcp lease renewal when the IP address remains the same; (bnc#800782).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=292
---
 patches.tar.bz2      | 4 ++--
 samba-doc.spec       | 2 +-
 samba.changes        | 6 ++++++
 samba.spec           | 2 +-
 vendor-files.tar.bz2 | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 6cc48ea..c67d005 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78c1cc7e98b421d6e7a87456ede6228c888eb32522cd0f24b53239e7c83f4208
-size 32536
+oid sha256:031305e77193b686e2e4c46ee65e16fccf0cbdfd6ab7dc45a7e91856eb1e5d05
+size 32567
diff --git a/samba-doc.spec b/samba-doc.spec
index d38b632..9418d58 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2924
+%define SOURCE_TIMESTAMP 2932
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
diff --git a/samba.changes b/samba.changes
index cd3a706..bb17efd 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb  6 14:24:40 UTC 2013 - sjayaraman@suse.de
+
+- Do not restart the smbfs service on pre-11.3 systems during dhcp lease
+  renewal when the IP address remains the same; (bnc#800782).
+
 -------------------------------------------------------------------
 Thu Jan 31 16:51:30 UTC 2013 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 960c4ed..1d4df74 100644
--- a/samba.spec
+++ b/samba.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2924
+%define SOURCE_TIMESTAMP 2932
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 307f4a3..328a654 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:77e320eabd5b4fd2535282db926055dd4763456c10bc978a97642809238e6115
-size 53370
+oid sha256:857969782ee835889341ded773d38727e9e104cfbabc6720cdbae6b970e562f2
+size 53486

From 2d78bd6633816ee527ad01e6438c2e3c03f76994af27138f8784fdaa7cff6ef5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Thu, 7 Feb 2013 12:56:02 +0000
Subject: [PATCH 2/6] Remove superfluous quotation marks while setting the
 SAMBA_VERSION_VENDOR_SUFFIX string.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=293
---
 patches.tar.bz2      | 4 ++--
 samba-doc.spec       | 4 ++--
 samba.changes        | 6 ++++++
 samba.spec           | 4 ++--
 vendor-files.tar.bz2 | 4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index c67d005..f996354 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:031305e77193b686e2e4c46ee65e16fccf0cbdfd6ab7dc45a7e91856eb1e5d05
-size 32567
+oid sha256:13b6c5238400293640e771b0dc28df28ccf335a71446eab3d7860356be31fa22
+size 32566
diff --git a/samba-doc.spec b/samba-doc.spec
index 9418d58..10bd1c7 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2932
+%define SOURCE_TIMESTAMP 2933
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
@@ -270,7 +270,7 @@ test "%{_build_arch}" != "" && \
 	product_suffix="${product_suffix}-%{_build_arch}"
 # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file
 mv VERSION VERSION.orig
-sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/" VERSION.orig >VERSION
+sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=${vendor_tag}%{VENDOR}${product_suffix}/" VERSION.orig >VERSION
 %endif
 
 %build samba-%{samba_ver_full}
diff --git a/samba.changes b/samba.changes
index bb17efd..3189641 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb  7 12:28:31 UTC 2013 - lmuelle@suse.com
+
+- Remove superfluous quotation marks while setting the
+  SAMBA_VERSION_VENDOR_SUFFIX string.
+
 -------------------------------------------------------------------
 Wed Feb  6 14:24:40 UTC 2013 - sjayaraman@suse.de
 
diff --git a/samba.spec b/samba.spec
index 1d4df74..41db282 100644
--- a/samba.spec
+++ b/samba.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2932
+%define SOURCE_TIMESTAMP 2933
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
@@ -740,7 +740,7 @@ test "%{_build_arch}" != "" && \
 	product_suffix="${product_suffix}-%{_build_arch}"
 # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file
 mv VERSION VERSION.orig
-sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/" VERSION.orig >VERSION
+sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=${vendor_tag}%{VENDOR}${product_suffix}/" VERSION.orig >VERSION
 
 %build
 %if 0%{?suse_version} && 0%{?suse_version} < 911
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 328a654..2b46f74 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:857969782ee835889341ded773d38727e9e104cfbabc6720cdbae6b970e562f2
-size 53486
+oid sha256:9a07fd27a3f3c02cec315a50c83a0d748f461d0728da1040f7f7aa4b9a43fd4a
+size 53403

From 723cc279ce03ef496b2670c47782f7ec7ada4efeb6d374c24ae344f1bea3aea6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Thu, 7 Feb 2013 15:10:28 +0000
Subject: [PATCH 3/6] Revert to r292 state.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=294
---
 patches.tar.bz2      | 4 ++--
 samba-doc.spec       | 4 ++--
 samba.changes        | 6 ------
 samba.spec           | 4 ++--
 vendor-files.tar.bz2 | 4 ++--
 5 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index f996354..9998b84 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:13b6c5238400293640e771b0dc28df28ccf335a71446eab3d7860356be31fa22
-size 32566
+oid sha256:6b502c89a292a052ab9d03668a4cc729fb18dc540745fa221dc87f55c1f2bcb5
+size 32580
diff --git a/samba-doc.spec b/samba-doc.spec
index 10bd1c7..f9d561b 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2933
+%define SOURCE_TIMESTAMP 2934
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
@@ -270,7 +270,7 @@ test "%{_build_arch}" != "" && \
 	product_suffix="${product_suffix}-%{_build_arch}"
 # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file
 mv VERSION VERSION.orig
-sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=${vendor_tag}%{VENDOR}${product_suffix}/" VERSION.orig >VERSION
+sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/" VERSION.orig >VERSION
 %endif
 
 %build samba-%{samba_ver_full}
diff --git a/samba.changes b/samba.changes
index 3189641..bb17efd 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-Thu Feb  7 12:28:31 UTC 2013 - lmuelle@suse.com
-
-- Remove superfluous quotation marks while setting the
-  SAMBA_VERSION_VENDOR_SUFFIX string.
-
 -------------------------------------------------------------------
 Wed Feb  6 14:24:40 UTC 2013 - sjayaraman@suse.de
 
diff --git a/samba.spec b/samba.spec
index 41db282..ca9d03c 100644
--- a/samba.spec
+++ b/samba.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2933
+%define SOURCE_TIMESTAMP 2934
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
@@ -740,7 +740,7 @@ test "%{_build_arch}" != "" && \
 	product_suffix="${product_suffix}-%{_build_arch}"
 # Set SAMBA_VERSION_VENDOR_SUFFIX in the VERSION file
 mv VERSION VERSION.orig
-sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=${vendor_tag}%{VENDOR}${product_suffix}/" VERSION.orig >VERSION
+sed -e "s/^SAMBA_VERSION_VENDOR_SUFFIX=$/SAMBA_VERSION_VENDOR_SUFFIX=\"${vendor_tag}%{VENDOR}${product_suffix}\"/" VERSION.orig >VERSION
 
 %build
 %if 0%{?suse_version} && 0%{?suse_version} < 911
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 2b46f74..20cbeda 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:9a07fd27a3f3c02cec315a50c83a0d748f461d0728da1040f7f7aa4b9a43fd4a
-size 53403
+oid sha256:588fc4ab47c8d2406495ea10a55b1075c4e683158104f61dff17f97d0380678c
+size 53484

From 67a5cc23ee5497f85928a9d4ef4dc44829024dd5d0e2b6385622298913f49c49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 8 Feb 2013 22:01:17 +0000
Subject: [PATCH 4/6] - Point LD_LIBRARY_PATH to the just built libraries while
 calling testparm to   generate the default share snippets on pre-12.2
 systems.

- Fix smbclient recursive mget EPERM handling; (bso#9633); (bnc#786350).

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=295
---
 patches.tar.bz2      |  4 ++--
 samba-doc.spec       |  2 +-
 samba.changes        | 11 +++++++++++
 samba.spec           |  5 ++++-
 vendor-files.tar.bz2 |  4 ++--
 5 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 9998b84..fe004c7 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b502c89a292a052ab9d03668a4cc729fb18dc540745fa221dc87f55c1f2bcb5
-size 32580
+oid sha256:b5cf583a1c40119d837202627f5677729ee8b53ab910235e2488cb3f9a4e122e
+size 33182
diff --git a/samba-doc.spec b/samba-doc.spec
index f9d561b..8af5b0d 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2934
+%define SOURCE_TIMESTAMP 2942
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
diff --git a/samba.changes b/samba.changes
index bb17efd..8a87ba9 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Feb  8 21:06:56 UTC 2013 - lmuelle@suse.com
+
+- Point LD_LIBRARY_PATH to the just built libraries while calling testparm to
+  generate the default share snippets on pre-12.2 systems.
+
+-------------------------------------------------------------------
+Thu Feb  7 15:30:36 UTC 2013 - ddiss@suse.com
+
+- Fix smbclient recursive mget EPERM handling; (bso#9633); (bnc#786350).
+
 -------------------------------------------------------------------
 Wed Feb  6 14:24:40 UTC 2013 - sjayaraman@suse.de
 
diff --git a/samba.spec b/samba.spec
index ca9d03c..e99889a 100644
--- a/samba.spec
+++ b/samba.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2934
+%define SOURCE_TIMESTAMP 2942
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
@@ -976,6 +976,9 @@ done
 %endif
 section_names=$( sed -ne 's/^\[\(.*\)\]$/\1/p' config/smb.conf)
 for section in $section_names; do
+%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1211
+	LD_LIBRARY_PATH=../source3/bin/ \
+%endif
 	../source3/bin/testparm -s --section-name "${section}" config/smb.conf >"%{buildroot}/%{_datadir}/samba/templates/default-${section}" || :
 done
 for file in config/templates/*; do
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 20cbeda..ee9cb4f 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:588fc4ab47c8d2406495ea10a55b1075c4e683158104f61dff17f97d0380678c
-size 53484
+oid sha256:ad7cb1d1e1a589f7e393bef0c0e314f7f3d4af01646ad86c3fd4882db5afb450
+size 53393

From 34c235a967713b72c9b67b42d0e84cace49365c39c5a35a9e24c61d20df2714d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 8 Feb 2013 22:38:28 +0000
Subject: [PATCH 5/6] Hyphenate the word just-built in the change log.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=296
---
 patches.tar.bz2      | 4 ++--
 samba-doc.spec       | 2 +-
 samba.changes        | 2 +-
 samba.spec           | 2 +-
 vendor-files.tar.bz2 | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index fe004c7..9822735 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5cf583a1c40119d837202627f5677729ee8b53ab910235e2488cb3f9a4e122e
-size 33182
+oid sha256:be3c59f33362096048a991a54a613ed31e1e12d3db83baf1a883c79901adca2a
+size 33196
diff --git a/samba-doc.spec b/samba-doc.spec
index 8af5b0d..1856bbc 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2942
+%define SOURCE_TIMESTAMP 2943
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
diff --git a/samba.changes b/samba.changes
index 8a87ba9..b713f93 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Fri Feb  8 21:06:56 UTC 2013 - lmuelle@suse.com
 
-- Point LD_LIBRARY_PATH to the just built libraries while calling testparm to
+- Point LD_LIBRARY_PATH to the just-built libraries while calling testparm to
   generate the default share snippets on pre-12.2 systems.
 
 -------------------------------------------------------------------
diff --git a/samba.spec b/samba.spec
index e99889a..808592b 100644
--- a/samba.spec
+++ b/samba.spec
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2942
+%define SOURCE_TIMESTAMP 2943
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index ee9cb4f..1b7102d 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:ad7cb1d1e1a589f7e393bef0c0e314f7f3d4af01646ad86c3fd4882db5afb450
-size 53393
+oid sha256:0b56ff70959a942152592c646fd82f5a7edfaec51e6c384e3e8f55bc30341d4e
+size 53492

From 324e80361dc1f92797e3bd76f37b280d38371097ab86d41322c119b18104a95d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Tue, 26 Feb 2013 13:39:34 +0000
Subject: [PATCH 6/6] - No longer use the cifs- or smbfstab named configuration
 file on post-12.2   systems; (bnc#804822).

- Shift the smbfs init script nfs dependency from Required to Should.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=297
---
 patches.tar.bz2      |  4 +--
 samba-doc.spec       |  4 +--
 samba.changes        | 11 ++++++++
 samba.spec           | 64 ++++++++++++++++++++++++++++++--------------
 vendor-files.tar.bz2 |  4 +--
 5 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 9822735..2683bb2 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be3c59f33362096048a991a54a613ed31e1e12d3db83baf1a883c79901adca2a
-size 33196
+oid sha256:45dba275acb7a67f755c324c4dd2e5aa235862473c62581200c0c866b3b60d8a
+size 33147
diff --git a/samba-doc.spec b/samba-doc.spec
index 1856bbc..74486be 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package samba-doc
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2943
+%define SOURCE_TIMESTAMP 2956
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
diff --git a/samba.changes b/samba.changes
index b713f93..09b5594 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Feb 26 13:03:46 UTC 2013 - lmuelle@suse.com
+
+- No longer use the cifs- or smbfstab named configuration file on post-12.2
+  systems; (bnc#804822).
+
+-------------------------------------------------------------------
+Mon Feb 25 13:08:58 UTC 2013 - lmuelle@suse.com
+
+- Shift the smbfs init script nfs dependency from Required to Should.
+
 -------------------------------------------------------------------
 Fri Feb  8 21:06:56 UTC 2013 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index 808592b..b211d57 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package samba
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -126,7 +126,7 @@ BuildRequires:  libtevent-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 2943
+%define SOURCE_TIMESTAMP 2956
 %define BRANCH %{version}
 Version:        3.6.12
 Release:        0
@@ -968,11 +968,11 @@ echo "# version at %{DOCDIR}/examples/smb.conf.%{VENDOR} if the" >>config/smb.co
 echo "# samba-doc package is installed." >>config/smb.conf
 grep -v "\(^#\|^;\|^$\)" config/smb.conf.vendor >>config/smb.conf
 install -p -m 0644 config/smb.conf.vendor ../examples/smb.conf.%{VENDOR}
-for file in smb.conf lmhosts smbusers smbpasswd cifstab smbusers; do
+for file in smb.conf lmhosts smbusers smbpasswd smbusers; do
 	install -m 0644 "config/${file}" %{buildroot}/%{CONFIGDIR}/${file}
 done
-%if 0%{?suse_version} && 0%{?suse_version} < 1121
-	mv %{buildroot}/%{CONFIGDIR}/cifstab %{buildroot}/%{CONFIGDIR}/smbfstab
+%if 0%{?suse_version} && 0%{?suse_version} < 1221
+	install -m 0644 -p config/cifstab %{buildroot}/%{CONFIGDIR}/%{cifs_init_script}tab
 %endif
 section_names=$( sed -ne 's/^\[\(.*\)\]$/\1/p' config/smb.conf)
 for section in $section_names; do
@@ -997,7 +997,10 @@ elif test 0%{?suse_version} -lt 1131; then
 	scriptSuffix="-1130"
 fi
 %endif
-startScripts="smb nmb winbind %{cifs_init_script}"
+startScripts="smb nmb winbind"
+%if 0%{?suse_version} && 0%{?suse_version} < 1221
+	startScripts="${startScripts} %{cifs_init_script}"
+%endif
 for script in ${startScripts}; do
 	install -m 0755 "init/${script}${scriptSuffix}" \
 		"%{buildroot}/%{INITDIR}/${script}"
@@ -1017,18 +1020,29 @@ install -m 0755 tools/update-apparmor-samba-profile \
 	%{buildroot}/%{_datadir}/samba/
 # PDF generator
 install -p -m 0755 tools/smbprngenpdf %{buildroot}/%{_bindir}/smbprngenpdf
-touch %{buildroot}/var/run/%{cifs_init_script}
 install -m 0644 config/samba.reg %{buildroot}/%{_sysconfdir}/slp.reg.d/samba.reg
 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
+for script in dhcpcd-hook-samba dhcpcd-hook-samba-functions samba-winbindd; do
 	install -m 0755 "tools/${script}" "%{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/${script}"
 done
+%if 0%{?suse_version} && 0%{?suse_version} < 1221
+	touch %{buildroot}/var/run/%{cifs_init_script}
+%if 0%{?suse_version} < 1121
+	sed -e 's/cifs/smbfs/g' tools/cifs >%{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script}
+	touch --reference=tools/cifs %{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script}
+%else
+	install -m 0755 -p tools/cifs %{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script}
+%endif
+%endif
 # Create ghosts for the symlinks
-for script in 21-dhcpcd-hook-samba 21-%{cifs_init_script} 55-samba-winbindd; do
+for script in 21-dhcpcd-hook-samba 55-samba-winbindd; do
 	touch %{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script}
 done
+%if 0%{?suse_version} && 0%{?suse_version} < 1221
+	touch %{buildroot}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/21-%{cifs_init_script}
+%endif
 # Install SuSEfirewall2 config files
 %if 0%{?suse_version} && 0%{?suse_version} > 1020
 install -m 0644 config/sysconfig.firewall.netbios-server \
@@ -1166,6 +1180,7 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || :
 %{?insserv_cleanup:%{insserv_cleanup}}
 
 %pre client
+%if 0%{?suse_version} && 0%{?suse_version} < 1221
 # non SUSE + 11.3 an newer, update, no cifstab, but smbfstab
 if [ ! 0%{?suse_version} -lt 1121 -a \
 	${1:-0} -gt 1 -a \
@@ -1174,6 +1189,7 @@ if [ ! 0%{?suse_version} -lt 1121 -a \
 	cp -a /etc/samba/smbfstab /var/adm/backup/etc_samba_smbfstab-move
 	chkconfig -c smbfs && >/var/adm/backup/etc_samba_smbfs-enabled || :
 fi
+%endif
 
 %preun client
 %{?stop_on_removal:%{stop_on_removal %cifs_init_script}}
@@ -1187,20 +1203,25 @@ if [ ${1:-0} -eq 1 ]; then
 %endif
 	ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-dhcpcd-hook-samba
 	ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba
+%if 0%{?suse_version} && 0%{?suse_version} < 1221
 	ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-%{cifs_init_script}
 	ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-%{cifs_init_script}
+%endif
 else
 	for if_case in if-down.d if-up.d; do
 		test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba || \
 			continue
 		rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/dhcpcd-hook-samba
 		ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/21-dhcpcd-hook-samba
+%if 0%{?suse_version} && 0%{?suse_version} < 1221
 		test -h %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/%{cifs_init_script} || \
 			continue
 		rm -f %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/%{cifs_init_script}
 		ln -fs %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script} %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/${if_case}/21-%{cifs_init_script}
+%endif
 	done
 fi
+%if 0%{?suse_version} && 0%{?suse_version} < 1221
 if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
 	test -f /etc/samba/cifstab && \
 		mv /etc/samba/cifstab /etc/samba/cifstab.rpmnew
@@ -1210,6 +1231,7 @@ if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
 		rm /var/adm/backup/etc_samba_smbfs-enabled
 	fi
 fi
+%endif
 if ! test -e %{_bindir}/get_printing_ticket; then
 	ln -fs %{_bindir}/smbspool %{cups_lib_dir}/backend/smb
 fi
@@ -1407,11 +1429,23 @@ fi
 
 %files client -f net.lang
 %defattr(-,root,root)
+%if 0%{?suse_version} && 0%{?suse_version} < 1221
 %attr(0754,root,root) %config %{INITDIR}/%{cifs_init_script}
+%attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/%{cifs_init_script}tab
+%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-%{cifs_init_script}
+%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-%{cifs_init_script}
+%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script}
+%{_sbindir}/rc%{cifs_init_script}
+%if 0%{?suse_version} && 0%{?suse_version} < 1100
+%dir %{_datadir}/omc
+%dir %{_datadir}/omc/svcinfo.d
+%endif
+%attr(0644,root,root) %{_datadir}/omc/svcinfo.d/%{cifs_init_script}.xml
+%ghost %{_localstatedir}/run/%{cifs_init_script}
+%endif
 %dir %{CONFIGDIR}
 %config(noreplace) %{CONFIGDIR}/lmhosts
 %config(noreplace) %{CONFIGDIR}/smb.conf
-%attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/%{cifs_init_script}tab
 %dir %{_sysconfdir}/openldap
 %dir %{_sysconfdir}/openldap/schema
 %attr(0444,root,root) %config %{_sysconfdir}/openldap/schema/samba3.schema
@@ -1419,9 +1453,6 @@ fi
 %ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-dhcpcd-hook-samba
 %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba
 %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/dhcpcd-hook-samba-functions
-%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-down.d/21-%{cifs_init_script}
-%ghost %{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-up.d/21-%{cifs_init_script}
-%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/scripts/%{cifs_init_script}
 %if 0%{?suse_version} && 0%{?suse_version} > 1100
 %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/samba-client
 %endif
@@ -1458,7 +1489,6 @@ fi
 %{_bindir}/tdbrestore
 %{_bindir}/tdbtool
 %endif
-%{_sbindir}/rc%{cifs_init_script}
 /%{_lib}/libnss_wins.so.2
 %dir %{cups_lib_dir}
 %dir %{cups_lib_dir}/backend
@@ -1494,11 +1524,6 @@ fi
 %doc %{_mandir}/man8/tdbbackup.8.*
 %doc %{_mandir}/man8/tdbdump.8.*
 %doc %{_mandir}/man8/tdbtool.8.*
-%if 0%{?suse_version} && 0%{?suse_version} < 1100
-%dir %{_datadir}/omc
-%dir %{_datadir}/omc/svcinfo.d
-%endif
-%attr(0644,root,root) %{_datadir}/omc/svcinfo.d/%{cifs_init_script}.xml
 %dir %{_datadir}/samba
 %dir %{_datadir}/samba/LDAP
 %config %{_datadir}/samba/LDAP/samba-nds.schema
@@ -1507,7 +1532,6 @@ fi
 %doc %{DOCDIR}/README.%{VENDOR}
 %{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf
 %{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client
-%ghost %{_localstatedir}/run/%{cifs_init_script}
 %dir %{LOCKDIR}
 %attr(0750,root,root) %dir %{LOGDIR}
 %ghost %dir %{PIDDIR}
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 1b7102d..ed43623 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:0b56ff70959a942152592c646fd82f5a7edfaec51e6c384e3e8f55bc30341d4e
-size 53492
+oid sha256:ce5dd2194b4d9421cabf9615b817d1f9b922352d686f231be9c3f7b7a8a5fe27
+size 53283