diff --git a/build-source-timestamp b/build-source-timestamp index 7f06f4a..f944e7a 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2491 +2492 Branch : 3.5.6 diff --git a/samba-doc.spec b/samba-doc.spec index ff3f696..20a0224 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -65,11 +65,15 @@ BuildRequires: pkgconfig %define guards_symbols pre_1111 %endif %if 0%{?suse_version} > 1131 -%define libtevent_ver 0.9.8 %define libldb_ver 0.9.7 +%define libtalloc_ver 2.0.1 +%define libtdb_ver 1.2.1 +%define libtevent_ver 0.9.8 %else -%define libtevent_ver %{version} %define libldb_ver %{version} +%define libtalloc_ver %{version} +%define libtdb_ver %{version} +%define libtevent_ver %{version} %endif Url: http://www.samba.org/ Version: 3.5.6 @@ -403,7 +407,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %changelog diff --git a/samba.changes b/samba.changes index a1d9850..f54301f 100644 --- a/samba.changes +++ b/samba.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Wed Feb 9 23:14:03 UTC 2011 - lmuelle@suse.de -- Use the actual version numbers of ldb and tevent on post-11.3 systems. +- Use the actual version numbers of the ldb, talloc, tdb, and tevent libraries + on post-11.3 systems. ------------------------------------------------------------------- Tue Jan 18 11:04:02 CET 2011 - ddiss@suse.de diff --git a/samba.spec b/samba.spec index 8ce8378..f2833c4 100644 --- a/samba.spec +++ b/samba.spec @@ -65,11 +65,15 @@ BuildRequires: pkgconfig %define guards_symbols pre_1111 %endif %if 0%{?suse_version} > 1131 -%define libtevent_ver 0.9.8 %define libldb_ver 0.9.7 +%define libtalloc_ver 2.0.1 +%define libtdb_ver 1.2.1 +%define libtevent_ver 0.9.8 %else -%define libtevent_ver %{version} %define libldb_ver %{version} +%define libtalloc_ver %{version} +%define libtdb_ver %{version} +%define libtevent_ver %{version} %endif %define vscan_ver 0.3.6b %define ldapsmb_ver 1.34b @@ -180,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %package client @@ -226,7 +230,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -253,7 +257,7 @@ Authors: The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %endif @@ -283,7 +287,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %endif @@ -310,7 +314,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %if %{make_utils} @@ -360,7 +364,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -386,7 +390,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %else @@ -431,7 +435,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %package -n libnetapi0 @@ -450,7 +454,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %package -n libnetapi-devel @@ -470,7 +474,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -491,7 +495,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %else @@ -527,7 +531,7 @@ Authors: The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %package -n libtalloc2 @@ -535,6 +539,8 @@ License: LGPLv3+ Summary: Samba talloc Library Group: System/Libraries AutoReqProv: on +Version: %{libtalloc_ver} +Release: 1 PreReq: /sbin/ldconfig %description -n libtalloc2 @@ -546,7 +552,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %package -n libtalloc-devel @@ -554,6 +560,8 @@ License: LGPLv3+ Summary: Libraries and Header Files to Develop Programs with talloc Support Group: Development/Libraries/C and C++ AutoReqProv: on +Version: %{libtalloc_ver} +Release: 1 Requires: libtalloc2 = %{version} %description -n libtalloc-devel @@ -566,7 +574,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %package -n libtdb1 @@ -574,6 +582,8 @@ License: LGPLv3+ Summary: Samba tdb Library Group: System/Libraries AutoReqProv: on +Version: %{libtdb_ver} +Release: 1 PreReq: /sbin/ldconfig %description -n libtdb1 @@ -585,7 +595,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %package -n libtdb-devel @@ -593,6 +603,8 @@ License: LGPLv3+ Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ AutoReqProv: on +Version: %{libtdb_ver} +Release: 1 Requires: libtdb1 = %{version} %description -n libtdb-devel @@ -605,7 +617,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %package -n libwbclient0 @@ -624,7 +636,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %package -n libwbclient-devel @@ -644,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %package -n libtevent0 @@ -665,7 +677,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %package -n libtevent-devel @@ -688,7 +700,7 @@ Authors: The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %package -n libldb0 @@ -710,7 +722,7 @@ Authors: The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %package -n libldb-devel @@ -732,7 +744,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %if %{make_ldapsmb} @@ -756,7 +768,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %endif @@ -779,7 +791,7 @@ Authors: -------- Steve French -Source Timestamp: 2491 +Source Timestamp: 2492 Branch : 3.5.6 %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 9d80253..62aeaea 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:0ef549215e1e69c6004860a792c9bb7f6b5b8cb96cfa3e5caddad08c9d97e8a7 -size 24823 +oid sha256:88841a6aeb7ce40590c0509438a6524d094290d5f3e87f36d8e4cfcff7ea272b +size 24818