diff --git a/build-source-timestamp b/build-source-timestamp index 9de9268..d5ae435 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2509 +2511 Branch : 3.5.8 diff --git a/samba-doc.spec b/samba-doc.spec index 2adceea..5d6637f 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -77,7 +77,7 @@ BuildRequires: pkgconfig %endif Url: http://www.samba.org/ Version: 3.5.8 -Release: 1 +Release: 2 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -420,7 +420,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %changelog diff --git a/samba.changes b/samba.changes index bbe3d67..f63ba33 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 9 10:46:20 UTC 2011 - lmuelle@suse.de + +- Define the libwbclient packages ahead of packages with a different version. + ------------------------------------------------------------------- Mon Mar 7 12:17:06 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 6c9b36a..cf92d89 100644 --- a/samba.spec +++ b/samba.spec @@ -82,7 +82,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.5.8 -Release: 1 +Release: 2 Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -184,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package client @@ -230,7 +230,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -257,7 +257,7 @@ Authors: The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %endif @@ -287,7 +287,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %endif @@ -314,7 +314,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %if %{make_utils} @@ -364,7 +364,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -390,7 +390,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %else @@ -435,7 +435,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libnetapi0 @@ -454,7 +454,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libnetapi-devel @@ -474,7 +474,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -495,7 +495,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %else @@ -531,93 +531,7 @@ Authors: The Samba Team -Source Timestamp: 2509 -Branch : 3.5.8 - -%package -n libtalloc2 -License: LGPLv3+ -Summary: Samba talloc Library -Group: System/Libraries -AutoReqProv: on -Version: %{libtalloc_ver} -Release: 5 -PreReq: /sbin/ldconfig - -%description -n libtalloc2 -This package includes the talloc library. - - - -Authors: --------- - The Samba Team - -Source Timestamp: 2509 -Branch : 3.5.8 - -%package -n libtalloc-devel -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: 5 -Requires: libtalloc2 = %{version} - -%description -n libtalloc-devel -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: 2509 -Branch : 3.5.8 - -%package -n libtdb1 -License: LGPLv3+ -Summary: Samba tdb Library -Group: System/Libraries -AutoReqProv: on -Version: %{libtdb_ver} -Release: 5 -PreReq: /sbin/ldconfig - -%description -n libtdb1 -This package includes the tdb library. - - - -Authors: --------- - The Samba Team - -Source Timestamp: 2509 -Branch : 3.5.8 - -%package -n libtdb-devel -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: 5 -Requires: libtdb1 = %{version} - -%description -n libtdb-devel -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: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libwbclient0 @@ -636,7 +550,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libwbclient-devel @@ -656,7 +570,93 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 +Branch : 3.5.8 + +%package -n libtalloc2 +License: LGPLv3+ +Summary: Samba talloc Library +Group: System/Libraries +AutoReqProv: on +Version: %{libtalloc_ver} +Release: 6 +PreReq: /sbin/ldconfig + +%description -n libtalloc2 +This package includes the talloc library. + + + +Authors: +-------- + The Samba Team + +Source Timestamp: 2511 +Branch : 3.5.8 + +%package -n libtalloc-devel +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: 6 +Requires: libtalloc2 = %{libtalloc_ver} + +%description -n libtalloc-devel +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: 2511 +Branch : 3.5.8 + +%package -n libtdb1 +License: LGPLv3+ +Summary: Samba tdb Library +Group: System/Libraries +AutoReqProv: on +Version: %{libtdb_ver} +Release: 6 +PreReq: /sbin/ldconfig + +%description -n libtdb1 +This package includes the tdb library. + + + +Authors: +-------- + The Samba Team + +Source Timestamp: 2511 +Branch : 3.5.8 + +%package -n libtdb-devel +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: 6 +Requires: libtdb1 = %{libtdb_ver} + +%description -n libtdb-devel +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: 2511 Branch : 3.5.8 %package -n libtevent0 @@ -665,7 +665,7 @@ Summary: Samba tevent Library Group: System/Libraries AutoReqProv: on Version: %{libtevent_ver} -Release: 5 +Release: 6 PreReq: /sbin/ldconfig %description -n libtevent0 @@ -677,7 +677,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libtevent-devel @@ -686,7 +686,7 @@ Summary: Libraries and Header Files to Develop Programs with tevent Suppo Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtevent_ver} -Release: 5 +Release: 6 Requires: libtevent0 = %{libtevent_ver} %description -n libtevent-devel @@ -700,7 +700,7 @@ Authors: The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libldb0 @@ -709,7 +709,7 @@ Summary: Samba ldb Library Group: System/Libraries AutoReqProv: on Version: %{libldb_ver} -Release: 5 +Release: 6 PreReq: /sbin/ldconfig %description -n libldb0 @@ -722,7 +722,7 @@ Authors: The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %package -n libldb-devel @@ -731,7 +731,7 @@ Summary: Libraries and Header Files to Develop Programs with ldb Support Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libldb_ver} -Release: 5 +Release: 6 Requires: libldb0 = %{libldb_ver} %description -n libldb-devel @@ -744,7 +744,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %if %{make_ldapsmb} @@ -755,7 +755,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 301 +Release: 302 Requires: perl-ldap %description -n ldapsmb @@ -768,7 +768,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %endif @@ -791,7 +791,7 @@ Authors: -------- Steve French -Source Timestamp: 2509 +Source Timestamp: 2511 Branch : 3.5.8 %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 0dc296d..aea8a8f 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:cb59f1f6e561bdf62536d6985a924b553c05fc3d8ba5b7263435414d17febc86 -size 24705 +oid sha256:87e2d366333b6ad41d6827b9c4e969a9d5ce189afbe61f3af7d475805c9aead6 +size 24736