From 00e8f5b7cf5d1e0a66eda4864c7f3e844395bda6ad3c835b403d70243dae5b6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 14 Mar 2012 17:52:00 +0000 Subject: [PATCH] Add the ldapsmb sources as else patches against them have no chance to apply. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=226 --- build-source-timestamp | 2 +- samba-doc.changes | 5 ++++ samba-doc.spec | 8 ++++++- samba.spec | 52 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 41 insertions(+), 30 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 16eae55..8a5a3b3 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2769 +2772 Branch : trunk diff --git a/samba-doc.changes b/samba-doc.changes index 59c7b42..0dbd4ca 100644 --- a/samba-doc.changes +++ b/samba-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 14 17:39:53 UTC 2012 - lmuelle@suse.com + +- Add the ldapsmb sources as else patches against them have no chance to apply. + ------------------------------------------------------------------- Wed Dec 21 12:59:18 UTC 2011 - coolo@suse.com diff --git a/samba-doc.spec b/samba-doc.spec index 49eeb2c..be2a6c1 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -106,6 +106,7 @@ BuildRequires: pkgconfig %endif Version: 3.6.3 Release: 1 +%define ldapsmb_ver 1.34b Url: http://www.samba.org/ License: GPL-3.0+ Summary: Samba Documentation @@ -122,6 +123,7 @@ Source1: vendor-files.tar.bz2 Source2: patches.tar.bz2 Source3: build-source-timestamp Source4: baselibs.conf +Source11: http://www.samba.org/~gd/ldapsmb/ldapsmb-%{ldapsmb_ver}.tar.bz2 # Choose some features / extra packages here ############################################ %define make_devel 0 @@ -189,6 +191,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # samba-doc nowadays is part the main samba spec file %if 0%{?suse_version} && 0%{?suse_version} < 1111 %setup -n samba-%{samba_ver_full} -q +# ldapsmb +%if %{make_ldapsmb} +%setup -T -D -a 11 -n samba-%{samba_ver_full} -q +%endif # patches %setup -T -D -a 2 -n samba-%{samba_ver_full} -q for patch in $( patches/tools/guards %{guards_symbols} -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %changelog diff --git a/samba.spec b/samba.spec index b9cb9a4..8f6895f 100644 --- a/samba.spec +++ b/samba.spec @@ -217,7 +217,7 @@ Authors: The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %package client @@ -263,7 +263,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -289,7 +289,7 @@ Authors: The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %endif @@ -319,7 +319,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %endif @@ -346,7 +346,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %if %{make_utils} @@ -367,7 +367,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %endif @@ -404,7 +404,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -430,14 +430,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %endif @@ -485,7 +485,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %package -n libnetapi0 @@ -503,7 +503,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %package -n libnetapi-devel @@ -527,7 +527,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -548,14 +548,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %endif @@ -591,7 +591,7 @@ Authors: The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %package -n libwbclient0 @@ -609,7 +609,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %package -n libwbclient-devel @@ -633,7 +633,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %package -n libtalloc2 @@ -653,7 +653,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %package -n libtalloc-devel @@ -679,7 +679,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %package -n libtdb1 @@ -699,7 +699,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %package -n libtdb-devel @@ -721,7 +721,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %package -n libtevent0 @@ -741,7 +741,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %package -n libtevent-devel @@ -769,7 +769,7 @@ Authors: The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %package -n libldb1 @@ -791,7 +791,7 @@ Authors: The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %package -n libldb-devel @@ -818,7 +818,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %if %{make_ldapsmb} @@ -841,7 +841,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2769 +Source Timestamp: 2772 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index ebd9329..2019ee0 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:f40c15c4dd6ce14b1041383d9d97b5df8b8baaafa59b5a232329a0e033c9e544 -size 52732 +oid sha256:ac8289840ec7aaca388f5255959c00f57f26c186f912cb0e2f47f95fd382d833 +size 52761