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
This commit is contained in:
Lars Müller 2012-03-14 17:52:00 +00:00 committed by Git OBS Bridge
parent c8e843ea3a
commit 00e8f5b7cf
5 changed files with 41 additions and 30 deletions

View File

@ -1,2 +1,2 @@
2769
2772
Branch : trunk

View File

@ -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

View File

@ -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} <patches/series); do
@ -448,7 +454,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%changelog

View File

@ -217,7 +217,7 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%package client
@ -263,7 +263,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
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 <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%endif
@ -319,7 +319,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%endif
@ -346,7 +346,7 @@ Authors:
--------
Jeremy Allison <jra at samba dot org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%if %{make_utils}
@ -367,7 +367,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%endif
@ -404,7 +404,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
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 <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%package -n libnetapi0
@ -503,7 +503,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%package -n libnetapi-devel
@ -527,7 +527,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
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 <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%package -n libwbclient0
@ -609,7 +609,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%package -n libwbclient-devel
@ -633,7 +633,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%package -n libtalloc2
@ -653,7 +653,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%package -n libtalloc-devel
@ -679,7 +679,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%package -n libtdb1
@ -699,7 +699,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%package -n libtdb-devel
@ -721,7 +721,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%package -n libtevent0
@ -741,7 +741,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%package -n libtevent-devel
@ -769,7 +769,7 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%package -n libldb1
@ -791,7 +791,7 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%package -n libldb-devel
@ -818,7 +818,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%if %{make_ldapsmb}
@ -841,7 +841,7 @@ Authors:
--------
Guenther Deschner <guenther at deschner dot de>
Source Timestamp: 2769
Source Timestamp: 2772
Branch : trunk
%endif

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f40c15c4dd6ce14b1041383d9d97b5df8b8baaafa59b5a232329a0e033c9e544
size 52732
oid sha256:ac8289840ec7aaca388f5255959c00f57f26c186f912cb0e2f47f95fd382d833
size 52761