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 1/4] 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 From a7c22044a27d3e8f50cf8e0de2aecb7c789bda88546fcc5786e671d0e6dfc82b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 10 Feb 2011 14:51:27 +0000 Subject: [PATCH 2/4] - Use the actual version numbers of the ldb, talloc, tdb, and tevent libraries on post-11.3 systems. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=154 --- build-source-timestamp | 2 +- samba-doc.spec | 10 +++++-- samba.changes | 3 +- samba.spec | 64 +++++++++++++++++++++++++----------------- vendor-files.tar.bz2 | 4 +-- 5 files changed, 50 insertions(+), 33 deletions(-) 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 From a909c8b76705f64c377b5ebda0bf0c60686288db7f169b5d634e055e74f439fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 10 Feb 2011 16:47:28 +0000 Subject: [PATCH 3/4] - Make the condition when libFOO_ver gets defined more generic. - Fail if the expected library version doesn't fit. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=155 --- build-source-timestamp | 2 +- samba-doc.spec | 4 +-- samba.spec | 61 +++++++++++++++++++++++++----------------- vendor-files.tar.bz2 | 4 +-- 4 files changed, 41 insertions(+), 30 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index f944e7a..4e8508c 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2492 +2494 Branch : 3.5.6 diff --git a/samba-doc.spec b/samba-doc.spec index 20a0224..8b9f4a8 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -64,7 +64,7 @@ BuildRequires: pkgconfig %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif -%if 0%{?suse_version} > 1131 +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 %define libldb_ver 0.9.7 %define libtalloc_ver 2.0.1 %define libtdb_ver 1.2.1 @@ -407,7 +407,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %changelog diff --git a/samba.spec b/samba.spec index f2833c4..ba3fda1 100644 --- a/samba.spec +++ b/samba.spec @@ -64,7 +64,7 @@ BuildRequires: pkgconfig %if 0%{?suse_version} && 0%{?suse_version} < 1111 %define guards_symbols pre_1111 %endif -%if 0%{?suse_version} > 1131 +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 %define libldb_ver 0.9.7 %define libtalloc_ver 2.0.1 %define libtdb_ver 1.2.1 @@ -184,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %package client @@ -230,7 +230,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -257,7 +257,7 @@ Authors: The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %endif @@ -287,7 +287,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %endif @@ -314,7 +314,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %if %{make_utils} @@ -364,7 +364,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -390,7 +390,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %else @@ -435,7 +435,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %package -n libnetapi0 @@ -454,7 +454,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %package -n libnetapi-devel @@ -474,7 +474,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -495,7 +495,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %else @@ -531,7 +531,7 @@ Authors: The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %package -n libtalloc2 @@ -552,7 +552,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %package -n libtalloc-devel @@ -574,7 +574,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %package -n libtdb1 @@ -595,7 +595,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %package -n libtdb-devel @@ -617,7 +617,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %package -n libwbclient0 @@ -636,7 +636,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %package -n libwbclient-devel @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %package -n libtevent0 @@ -677,7 +677,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %package -n libtevent-devel @@ -700,7 +700,7 @@ Authors: The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %package -n libldb0 @@ -722,7 +722,7 @@ Authors: The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %package -n libldb-devel @@ -744,7 +744,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %if %{make_ldapsmb} @@ -768,7 +768,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %endif @@ -791,7 +791,7 @@ Authors: -------- Steve French -Source Timestamp: 2492 +Source Timestamp: 2494 Branch : 3.5.6 %endif @@ -823,6 +823,17 @@ Authors: %prep %setup -n samba-%{samba_ver_full} -q +# check if our library versions from the spec are still current +%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 +grep "^AC_INIT(ldb, %{libldb_ver})$" source4/lib/ldb/configure.ac || \ + exit 1 +grep "^AC_INIT(talloc, %{libtalloc_ver})$" lib/talloc/configure.ac || \ + exit 1 +grep "^AC_INIT(tdb, %{libtdb_ver})$" lib/tdb/configure.ac || \ + exit 1 +grep "^AC_INIT(tevent, %{libtevent_ver})$" lib/tevent/configure.ac || \ + exit 1 +%endif # ldapsmb %if %{make_ldapsmb} %setup -T -D -a 11 -n samba-%{samba_ver_full} -q diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 62aeaea..2a1c0b9 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:88841a6aeb7ce40590c0509438a6524d094290d5f3e87f36d8e4cfcff7ea272b -size 24818 +oid sha256:a007b13c07a4543b5892d74525f51026bde30f6dad05dbf19a52d00a765c61c0 +size 24827 From 2cb3127c4510b929968db868533e9d1e540d549002f8926a87118eb4a79a417e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 10 Feb 2011 17:47:34 +0000 Subject: [PATCH 4/4] - Do not require a particular library version if the major version is part of the package name. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=156 --- build-source-timestamp | 2 +- samba-doc.spec | 2 +- samba.changes | 6 ++++ samba.spec | 70 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 +-- 5 files changed, 45 insertions(+), 39 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 4e8508c..871ff24 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2494 +2495 Branch : 3.5.6 diff --git a/samba-doc.spec b/samba-doc.spec index 8b9f4a8..d5b16e4 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -407,7 +407,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %changelog diff --git a/samba.changes b/samba.changes index f54301f..c850c18 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 10 17:09:42 UTC 2011 - lmuelle@suse.de + +- Do not require a particular library version if the major version is part of + the package name. + ------------------------------------------------------------------- Wed Feb 9 23:14:03 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index ba3fda1..9f4415e 100644 --- a/samba.spec +++ b/samba.spec @@ -184,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %package client @@ -230,7 +230,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -257,7 +257,7 @@ Authors: The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %endif @@ -287,7 +287,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %endif @@ -314,7 +314,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %if %{make_utils} @@ -364,7 +364,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -390,7 +390,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %else @@ -416,12 +416,12 @@ Summary: Libraries and Header Files to Develop Programs with smbclient Su Group: Development/Libraries/C and C++ AutoReqProv: on %if 0%{?suse_version} && 0%{?suse_version} < 921 -Requires: libsmbclient = %{version} heimdal-devel +Requires: libsmbclient heimdal-devel %else %if 0%{?suse_version} && 0%{?suse_version} < 1031 -Requires: libsmbclient = %{version} krb5-devel +Requires: libsmbclient krb5-devel %else -Requires: libsmbclient0 = %{version} krb5-devel +Requires: libsmbclient0 krb5-devel %endif %endif @@ -435,7 +435,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %package -n libnetapi0 @@ -454,7 +454,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %package -n libnetapi-devel @@ -462,7 +462,7 @@ License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with netapi Support Group: Development/Libraries/C and C++ AutoReqProv: on -Requires: libnetapi0 = %{version} +Requires: libnetapi0 %description -n libnetapi-devel This package contains the static libraries and header files needed to @@ -474,7 +474,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -495,7 +495,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %else @@ -515,9 +515,9 @@ Summary: Libraries and Header Files to Develop Programs with smbsharemode Group: Development/Libraries/C and C++ AutoReqProv: on %if 0%{?suse_version} && 0%{?suse_version} < 1031 -Requires: libsmbsharemodes = %{version} +Requires: libsmbsharemodes %else -Requires: libsmbsharemodes0 = %{version} +Requires: libsmbsharemodes0 %endif %description -n libsmbsharemodes-devel @@ -531,7 +531,7 @@ Authors: The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %package -n libtalloc2 @@ -552,7 +552,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %package -n libtalloc-devel @@ -562,7 +562,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtalloc_ver} Release: 1 -Requires: libtalloc2 = %{version} +Requires: libtalloc2 %description -n libtalloc-devel This package contains the static libraries and header files needed to @@ -574,7 +574,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %package -n libtdb1 @@ -595,7 +595,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %package -n libtdb-devel @@ -605,7 +605,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtdb_ver} Release: 1 -Requires: libtdb1 = %{version} +Requires: libtdb1 %description -n libtdb-devel This package contains the static libraries and header files needed to @@ -617,7 +617,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %package -n libwbclient0 @@ -636,7 +636,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %package -n libwbclient-devel @@ -644,7 +644,7 @@ License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ AutoReqProv: on -Requires: libwbclient0 = %{version} +Requires: libwbclient0 %description -n libwbclient-devel This package contains the static libraries and header files needed to @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %package -n libtevent0 @@ -677,7 +677,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %package -n libtevent-devel @@ -687,7 +687,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtevent_ver} Release: 1 -Requires: libtevent0 = %{libtevent_ver} +Requires: libtevent0 %description -n libtevent-devel This package contains the static libraries and header files needed to @@ -700,7 +700,7 @@ Authors: The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %package -n libldb0 @@ -722,7 +722,7 @@ Authors: The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %package -n libldb-devel @@ -732,7 +732,7 @@ Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libldb_ver} Release: 1 -Requires: libldb0 = %{libldb_ver} +Requires: libldb0 %description -n libldb-devel This package contains the static libraries and header files needed to @@ -744,7 +744,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %if %{make_ldapsmb} @@ -768,7 +768,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %endif @@ -791,7 +791,7 @@ Authors: -------- Steve French -Source Timestamp: 2494 +Source Timestamp: 2495 Branch : 3.5.6 %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 2a1c0b9..53371d5 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:a007b13c07a4543b5892d74525f51026bde30f6dad05dbf19a52d00a765c61c0 -size 24827 +oid sha256:a3ab635ae4e42c8c422b511ca81bab5f018851b087138d5637b8fefea56b4620 +size 24816