From 39212d4f0b03b9c1eba4d62d0930f45e83a5c3148baf2953378785809aa179b2 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 15 May 2009 20:13:32 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=38 --- build-source-timestamp | 4 +- patches.tar.bz2 | 4 +- samba-doc.spec | 6 +-- samba.changes | 6 +++ samba.spec | 104 ++++++++++++++++++++++------------------- vendor-files.tar.bz2 | 2 +- 6 files changed, 69 insertions(+), 57 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 30e771d..90e1af1 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2112 -Branch : trunk +2115 +Branch : 3.3.4 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index bcff3ad..0a04025 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e5e977205e4202bef23156a74713d6f633ef5b1a12695c952d0cea5629c3af6 -size 58683 +oid sha256:d1a9e8e88fedfc48dc07e46853f4b02602158ee8694706302149eda1ef390d6b +size 58686 diff --git a/samba-doc.spec b/samba-doc.spec index 92fb2b0..05d74ef 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -26,7 +26,7 @@ BuildRequires: ccache cracklib-devel cups-devel e2fsprogs-devel gdbm-devel krb5 License: GPL v3 or later Url: http://www.samba.org/ Version: 3.3.4 -Release: 1 +Release: 2 Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -323,8 +323,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %changelog * Tue Mar 10 2009 lmuelle@suse.de diff --git a/samba.changes b/samba.changes index e8b184b..b4240c8 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat May 9 20:19:51 CEST 2009 - lmuelle@suse.de + +- Add BuildRequires to ctdb-devel for systems newer than SUSE 10.0 and all + other build targets. + ------------------------------------------------------------------- Thu Apr 30 15:15:41 CEST 2009 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 03ad9c2..5de4b6e 100644 --- a/samba.spec +++ b/samba.spec @@ -41,6 +41,9 @@ BuildRequires: cracklib-devel %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} BuildRequires: krb5-devel openldap-devel %endif +%if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version} +BuildRequires: ctdb-devel +%endif %define samba_ver 3.3.4 %define samba_ver_suffix %nil %define samba_ver_full %{samba_ver}%{samba_ver_suffix} @@ -51,7 +54,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.3.4 -Release: 1 +Release: 2 %ifarch ppc64 Obsoletes: samba-64bit %endif @@ -134,8 +137,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %package client License: GPL v3 or later @@ -174,8 +177,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -198,8 +201,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 @@ -228,8 +231,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %endif @@ -255,8 +258,8 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %if %{make_utils} @@ -304,8 +307,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -342,8 +345,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %else @@ -356,8 +359,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %endif This package includes the smbclient library. @@ -390,8 +393,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %package -n libnetapi0 License: GPL v3 or later @@ -409,8 +412,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %package -n libnetapi-devel License: GPL v3 or later @@ -429,8 +432,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -456,8 +459,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %else @@ -470,8 +473,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %endif This package includes the smbsharemodes library. @@ -501,8 +504,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %if %{make_ldapsmb} @@ -522,8 +525,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %package -n libtalloc-devel License: LGPL v3 or later @@ -542,8 +545,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %package -n libtdb1 License: LGPL v3 or later @@ -561,8 +564,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %package -n libtdb-devel License: LGPL v3 or later @@ -581,8 +584,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %package -n libwbclient0 License: GPL v3 or later @@ -600,8 +603,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %package -n libwbclient-devel License: GPL v3 or later @@ -620,8 +623,8 @@ Authors: -------- The Samba Team -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %package -n ldapsmb License: GPL v2 or later @@ -629,7 +632,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 260 +Release: 261 Requires: perl-ldap %description -n ldapsmb @@ -642,8 +645,8 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 920 @@ -666,8 +669,8 @@ Authors: -------- Steve French -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %endif %if %{make_vscan} @@ -678,7 +681,7 @@ Summary: On-Access Virus Scanning with Samba Group: Productivity/Networking/Samba AutoReqProv: on Version: 0.3.6b -Release: 264 +Release: 265 Provides: samba3-vscan = 0.3.6b Obsoletes: samba3-vscan Requires: samba = %{samba_ver} @@ -696,8 +699,8 @@ Authors: -------- Rainer Link -Source Timestamp: 2112 -Branch : trunk +Source Timestamp: 2115 +Branch : 3.3.4 %endif @@ -1698,6 +1701,9 @@ exit 0 %endif %changelog +* Sat May 09 2009 lmuelle@suse.de +- Add BuildRequires to ctdb-devel for systems newer than SUSE 10.0 and all + other build targets. * Thu Apr 30 2009 lmuelle@suse.de - Update to 3.3.4. + Fix domain logins for WinXP clients pre SP3 (bug #6263). diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 66e720f..dda4861 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:b594672aa69fe879710ad15157e3b7fd0a9b49b4a51d49651caa223f50f5d349 +oid sha256:c56201abefe91502537ad412a30680b899a6f0532f344b817ccc8e14c481d4ec size 23504