From 7d3c1b7ba8007327cdb052b41f92c5ede4d8345898cbafaef58d3922b31d0f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Tue, 8 Sep 2015 16:16:04 +0000
Subject: [PATCH] Followup to r484 for conditional libarchive

Else SLE 11, Fedora, CentOS, and RedHat fails to built.

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

diff --git a/patches.tar.bz2 b/patches.tar.bz2
index d376f99..9afb372 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:200c48e8407b81934abd397d9d481ce05a658de4a0c179d48183998415ba996e
-size 102801
+oid sha256:2dd5d7bc0f8f887c978f7a87d2ebfe5cac38932ce0f452f66efcda0af11b2a62
+size 102677
diff --git a/samba.spec b/samba.spec
index 08750c2..ebc0e16 100644
--- a/samba.spec
+++ b/samba.spec
@@ -144,7 +144,7 @@ BuildRequires:  systemd-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-%define SOURCE_TIMESTAMP 3463
+%define SOURCE_TIMESTAMP 3464
 %define BRANCH %{version}.SLE12_SP1
 %global with_mitkrb5 1
 %global with_dc 0
@@ -1143,6 +1143,9 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE ${OPTIMIZATION} -D_LARGEFILE64_SOURCE -
 %if 0%{?suse_version} && 0%{?suse_version} < 1141
 %{?suse_update_config:%{suse_update_config -f}}
 %endif
+%if 0%{?suse_version} < 1111
+bundled_libraries_extra="libarchive"
+%endif
 CONFIGURE_OPTIONS="\
 	--prefix=%{_prefix} \
 	--localstatedir=%{_localstatedir} \
@@ -1183,7 +1186,7 @@ CONFIGURE_OPTIONS="\
 %if ! %with_dc
 	--without-ad-dc \
 %endif
-	--bundled-libraries=NONE,ntdb,nss_wrapper,socket_wrapper,uid_wrapper,subunit \
+	--bundled-libraries=NONE,ntdb,nss_wrapper,socket_wrapper,uid_wrapper,subunit,${bundled_libraries_extra} \
 "
 ./configure ${CONFIGURE_OPTIONS}
 make %{build_make_smp_mflags} \
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index 1a95f59..d3eb297 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:ad47612634e5db144c1b7bb2e2414494836f9b7b7c5f13228314795fa76c84d0
-size 52815
+oid sha256:0b5224eb8bf09aa803aa86c4ac250d0685ef7661f4e9c66d98475c8a197c4875
+size 52812