diff --git a/build-source-timestamp b/build-source-timestamp index 16eae55..85e1a89 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2769 +2775 Branch : trunk diff --git a/samba-doc.changes b/samba-doc.changes index 59c7b42..58d805b 100644 --- a/samba-doc.changes +++ b/samba-doc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 14 17:39:53 UTC 2012 - lmuelle@suse.de + +- 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..330c5e0 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: 2775 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index ce7c779..4f8b1c6 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 14 20:00:25 UTC 2012 - lmuelle@suse.de + +- Remove obsoleted Authors lines from spec file for post-11.2 systems. + ------------------------------------------------------------------- Mon Feb 27 15:57:07 UTC 2012 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index b9cb9a4..ba825bd 100644 --- a/samba.spec +++ b/samba.spec @@ -211,13 +211,7 @@ binary packages of the most current Samba version, and a bug reporting how to. - -Authors: --------- - The Samba Team - - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package client @@ -258,12 +252,7 @@ binary packages of the most current Samba version, and a bug reporting how to. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -283,13 +272,7 @@ This package contains the static libraries and header files needed to develop programs which make use of Samba. - -Authors: --------- - The Samba Team - - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %endif @@ -314,12 +297,7 @@ This package contains all the Samba documentation as it is not part of the man pages. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %endif @@ -341,12 +319,7 @@ Requires: samba-client >= %{version} A wrapper binary to run smbspool with the original calling UID. - -Authors: --------- - Jeremy Allison - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %if %{make_utils} @@ -362,12 +335,7 @@ Obsoletes: samba-gplv3-utils < %{version} Some of the debug-tools for developpers. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %endif @@ -399,12 +367,7 @@ PreReq: coreutils This is the winbind-daemon and the wbinfo-tool. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -430,14 +393,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %endif @@ -449,10 +412,6 @@ This entry is required to allow a samba.spec file providing libsmbclient for SUSE version < 11.0 while versions > 10.0 will have libsmbclient0. -Authors: --------- - The Samba Team - %package -n libsmbclient-devel License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbclient Support @@ -480,12 +439,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbclient programming interface. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libnetapi0 @@ -498,12 +452,7 @@ PreReq: /sbin/ldconfig This package includes the netapi library. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libnetapi-devel @@ -522,12 +471,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the netapi programming interface. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -548,23 +492,19 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %endif This package includes the smbsharemodes library. -Authors: --------- - The Samba Team - %package -n libsmbsharemodes-devel License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support @@ -585,13 +525,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the smbsharemodes programming interface. - -Authors: --------- - The Samba Team - - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libwbclient0 @@ -604,12 +538,7 @@ PreReq: /sbin/ldconfig This package includes the wbclient library. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libwbclient-devel @@ -628,12 +557,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the wbclient programming interface. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libtalloc2 @@ -648,12 +572,7 @@ PreReq: /sbin/ldconfig This package includes the talloc library. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libtalloc-devel @@ -674,12 +593,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the talloc programming interface. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libtdb1 @@ -694,12 +608,7 @@ PreReq: /sbin/ldconfig This package includes the tdb library. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libtdb-devel @@ -716,12 +625,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tdb programming interface. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libtevent0 @@ -736,12 +640,7 @@ PreReq: /sbin/ldconfig This package includes the tevent library. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libtevent-devel @@ -763,13 +662,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. - -Authors: --------- - The Samba Team - - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libldb1 @@ -785,13 +678,7 @@ PreReq: /sbin/ldconfig This package includes the ldb library. - -Authors: --------- - The Samba Team - - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %package -n libldb-devel @@ -813,12 +700,7 @@ This package contains the static libraries and header files needed to develop programs which make use of the tevent programming interface. - -Authors: --------- - The Samba Team - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %if %{make_ldapsmb} @@ -836,12 +718,7 @@ This tool aims to simplify the administration of a Samba Domain Controller that uses the ldapsam passdb backend. - -Authors: --------- - Guenther Deschner - -Source Timestamp: 2769 +Source Timestamp: 2775 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index ebd9329..e3472aa 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:c335ebf5cedd6578c4d421f16fa63b0f33ece0b335425b3a6a967eee3992b5d4 +size 52736