From 21c870ad2d485b00bde83c5857b468175234bff8bf5358c493741679c025e54b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 9 Feb 2011 23:52:17 +0000 Subject: [PATCH] Use the actual version numbers of ldb and tevent on post-11.3 systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=153 --- build-source-timestamp | 2 +- samba-doc.spec | 11 +++++-- samba.changes | 5 +++ samba.spec | 71 +++++++++++++++++++++++++----------------- vendor-files.tar.bz2 | 4 +-- 5 files changed, 60 insertions(+), 33 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 1704317..7f06f4a 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2490 +2491 Branch : 3.5.6 diff --git a/samba-doc.spec b/samba-doc.spec index 7276bf3..ff3f696 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -64,9 +64,16 @@ BuildRequires: pkgconfig %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif +%if 0%{?suse_version} > 1131 +%define libtevent_ver 0.9.8 +%define libldb_ver 0.9.7 +%else +%define libtevent_ver %{version} +%define libldb_ver %{version} +%endif Url: http://www.samba.org/ Version: 3.5.6 -Release: 4 +Release: 5 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -396,7 +403,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %changelog diff --git a/samba.changes b/samba.changes index cb5fe4c..a1d9850 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +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. + ------------------------------------------------------------------- Tue Jan 18 11:04:02 CET 2011 - ddiss@suse.de diff --git a/samba.spec b/samba.spec index f96eade..8ce8378 100644 --- a/samba.spec +++ b/samba.spec @@ -64,6 +64,13 @@ BuildRequires: pkgconfig %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif +%if 0%{?suse_version} > 1131 +%define libtevent_ver 0.9.8 +%define libldb_ver 0.9.7 +%else +%define libtevent_ver %{version} +%define libldb_ver %{version} +%endif %define vscan_ver 0.3.6b %define ldapsmb_ver 1.34b License: GPLv3+ @@ -71,7 +78,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.5.6 -Release: 4 +Release: 5 Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -173,7 +180,7 @@ Authors: The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %package client @@ -219,7 +226,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -246,7 +253,7 @@ Authors: The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %endif @@ -276,7 +283,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %endif @@ -303,7 +310,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %if %{make_utils} @@ -353,7 +360,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -379,7 +386,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %else @@ -424,7 +431,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %package -n libnetapi0 @@ -443,7 +450,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %package -n libnetapi-devel @@ -463,7 +470,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -484,7 +491,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %else @@ -520,7 +527,7 @@ Authors: The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %package -n libtalloc2 @@ -539,7 +546,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %package -n libtalloc-devel @@ -559,7 +566,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %package -n libtdb1 @@ -578,7 +585,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %package -n libtdb-devel @@ -598,7 +605,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %package -n libwbclient0 @@ -617,7 +624,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %package -n libwbclient-devel @@ -637,7 +644,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %package -n libtevent0 @@ -645,6 +652,8 @@ License: LGPLv3+ Summary: Samba tevent Library Group: System/Libraries AutoReqProv: on +Version: %{libtevent_ver} +Release: 1 PreReq: /sbin/ldconfig %description -n libtevent0 @@ -656,7 +665,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %package -n libtevent-devel @@ -664,7 +673,9 @@ License: LGPLv3+ Summary: Libraries and Header Files to Develop Programs with tevent Support Group: Development/Libraries/C and C++ AutoReqProv: on -Requires: libtevent0 = %{version} +Version: %{libtevent_ver} +Release: 1 +Requires: libtevent0 = %{libtevent_ver} %description -n libtevent-devel This package contains the static libraries and header files needed to @@ -677,7 +688,7 @@ Authors: The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %package -n libldb0 @@ -685,6 +696,8 @@ License: LGPLv3+ Summary: Samba ldb Library Group: System/Libraries AutoReqProv: on +Version: %{libldb_ver} +Release: 1 PreReq: /sbin/ldconfig %description -n libldb0 @@ -697,7 +710,7 @@ Authors: The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %package -n libldb-devel @@ -705,7 +718,9 @@ License: LGPLv3+ Summary: Libraries and Header Files to Develop Programs with ldb Support Group: Development/Libraries/C and C++ AutoReqProv: on -Requires: libldb0 = %{version} +Version: %{libldb_ver} +Release: 1 +Requires: libldb0 = %{libldb_ver} %description -n libldb-devel This package contains the static libraries and header files needed to @@ -717,7 +732,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %if %{make_ldapsmb} @@ -728,7 +743,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 296 +Release: 297 Requires: perl-ldap %description -n ldapsmb @@ -741,7 +756,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %endif @@ -764,7 +779,7 @@ Authors: -------- Steve French -Source Timestamp: 2490 +Source Timestamp: 2491 Branch : 3.5.6 %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 4320b7e..9d80253 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:d6b52dc170ce6a46575f1f236f1442c9e7a5990d1a5746d08420809ff37b84e1 -size 24812 +oid sha256:0ef549215e1e69c6004860a792c9bb7f6b5b8cb96cfa3e5caddad08c9d97e8a7 +size 24823