From eed44281afe309b214a206f96298a41f1095901b7949ecc17fa4b90885c19d5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Fri, 7 Feb 2014 17:18:53 +0000
Subject: [PATCH] - Streamline the vendor suffix handling and add support for
 SLE 12.

- Fix zero length server-side copy request handling; (bso#10424);
  (bnc#862558).
  + Refresh context in remaining patch stack.

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

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index d788d14..0b951ab 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:447f4b88477ebc5311e4fe54433e750d6bd70b29c4e5f266efda33fdcf0dd485
-size 159179
+oid sha256:1776acdd67d05bb03c06284f9692cf1a179754c1bbecd5cf32e914c0b0448128
+size 160302
diff --git a/samba.changes b/samba.changes
index 2a3b876..2ca4691 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Feb  7 16:48:52 UTC 2014 - lmuelle@suse.com
+
+- Streamline the vendor suffix handling and add support for SLE 12.
+
+-------------------------------------------------------------------
+Fri Feb  7 16:07:50 UTC 2014 - ddiss@suse.com
+
+- Fix zero length server-side copy request handling; (bso#10424);
+  (bnc#862558).
+  + Refresh context in remaining patch stack.
+
 -------------------------------------------------------------------
 Tue Feb  4 17:22:52 UTC 2014 - lmuelle@suse.com
 
diff --git a/samba.spec b/samba.spec
index e07bd27..d96278d 100644
--- a/samba.spec
+++ b/samba.spec
@@ -141,7 +141,7 @@ BuildRequires:  systemd
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3177
+%define SOURCE_TIMESTAMP 3179
 %define BRANCH %{version}
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1178,20 +1178,20 @@ test 0%{?fedora_version} -gt 0 && product_version=%{?fedora_version}
 test 0%{?mandriva_version} -gt 0 && product_version=%{?mandriva_version}
 test 0%{?rhel_version} -gt 0 && product_version=%{?rhel_version}
 test 0%{?suse_version} -gt 0 && product_version=%{?suse_version}
+%if 0%{?suse_version} > 0
 major_version=$((${product_version}/100))
 minor_version=$((${product_version}/10))
 minor_version="${minor_version#$major_version}"
 product_version="${major_version}.${minor_version}"
-product_suffix=""
-if test "%{VENDOR}" != "UL"; then
-	if test 0%{?sles_version} -gt 0; then
-		product_suffix="-SLE_%{sles_version}"
-	elif test 0%{?suse_version} -gt 0; then
-		product_suffix="-oS${product_version}"
-	else
-		product_suffix="-OBS"
-	fi
-fi
+case "%{suse_version}" in
+	1010) product_suffix="-SLE_10" ;;
+	1110) product_suffix="-SLE_11" ;;
+	1315) product_suffix="-SLE_12" ;;
+	*) product_suffix="-oS${product_version}" ;;
+esac
+%else
+product_suffix="-OBS"
+%endif
 # Add the build architecture
 test "%{_build_arch}" != "" && \
 	product_suffix="${product_suffix}-%{_build_arch}"
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index c134fee..6c2f8d8 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:6a2851cf9bd81cce52815f70f686c87f05b946ff36938c5b2647b2fda27d71ce
-size 54144
+oid sha256:6d918ceca730ea881ad0081b31cf9a07441a22024ca01800c180a4305a4e5442
+size 53922