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] - 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