Accepting request 60539 from network:samba:STABLE

Accepted submit request 60539 from user lmuelle

OBS-URL: https://build.opensuse.org/request/show/60539
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=83
This commit is contained in:
Ruediger Oertel 2011-02-12 11:18:08 +00:00 committed by Git OBS Bridge
commit 00f1b34b99
5 changed files with 105 additions and 44 deletions

View File

@ -1,2 +1,2 @@
2490
2495
Branch : 3.5.6

View File

@ -64,9 +64,20 @@ BuildRequires: pkgconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1111
%define guards_symbols pre_1111
%endif
%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
%define libtevent_ver 0.9.8
%else
%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
Release: 4
Release: 5
License: GPLv3+
Summary: Samba Documentation
Group: Documentation/Other
@ -396,7 +407,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%changelog

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
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
- 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

View File

@ -64,6 +64,17 @@ BuildRequires: pkgconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1111
%define guards_symbols pre_1111
%endif
%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
%define libtevent_ver 0.9.8
%else
%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
License: GPLv3+
@ -71,7 +82,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 +184,7 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%package client
@ -219,7 +230,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@ -246,7 +257,7 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%endif
@ -276,7 +287,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%endif
@ -303,14 +314,13 @@ Authors:
--------
Jeremy Allison <jra at samba dot org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%if %{make_utils}
%package utils
Summary: debug tools
Group: Productivity/Networking/Samba
AutoReqProv: on
@ -354,7 +364,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -379,7 +389,8 @@ PreReq: /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbclient
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%else
@ -405,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
@ -424,7 +435,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%package -n libnetapi0
@ -443,7 +454,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%package -n libnetapi-devel
@ -451,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
@ -463,7 +474,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -483,7 +494,8 @@ PreReq: /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1031
%description -n libsmbsharemodes
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%else
@ -503,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
@ -519,7 +531,7 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%package -n libtalloc2
@ -527,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
@ -538,7 +552,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%package -n libtalloc-devel
@ -546,7 +560,9 @@ License: LGPLv3+
Summary: Libraries and Header Files to Develop Programs with talloc Support
Group: Development/Libraries/C and C++
AutoReqProv: on
Requires: libtalloc2 = %{version}
Version: %{libtalloc_ver}
Release: 1
Requires: libtalloc2
%description -n libtalloc-devel
This package contains the static libraries and header files needed to
@ -558,7 +574,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%package -n libtdb1
@ -566,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
@ -577,7 +595,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%package -n libtdb-devel
@ -585,7 +603,9 @@ License: LGPLv3+
Summary: Libraries and Header Files to Develop Programs with tdb Support
Group: Development/Libraries/C and C++
AutoReqProv: on
Requires: libtdb1 = %{version}
Version: %{libtdb_ver}
Release: 1
Requires: libtdb1
%description -n libtdb-devel
This package contains the static libraries and header files needed to
@ -597,7 +617,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%package -n libwbclient0
@ -616,7 +636,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%package -n libwbclient-devel
@ -624,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
@ -636,7 +656,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%package -n libtevent0
@ -644,6 +664,8 @@ License: LGPLv3+
Summary: Samba tevent Library
Group: System/Libraries
AutoReqProv: on
Version: %{libtevent_ver}
Release: 1
PreReq: /sbin/ldconfig
%description -n libtevent0
@ -655,7 +677,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%package -n libtevent-devel
@ -663,7 +685,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
%description -n libtevent-devel
This package contains the static libraries and header files needed to
@ -676,7 +700,7 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%package -n libldb0
@ -684,6 +708,8 @@ License: LGPLv3+
Summary: Samba ldb Library
Group: System/Libraries
AutoReqProv: on
Version: %{libldb_ver}
Release: 1
PreReq: /sbin/ldconfig
%description -n libldb0
@ -696,7 +722,7 @@ Authors:
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%package -n libldb-devel
@ -704,7 +730,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
%description -n libldb-devel
This package contains the static libraries and header files needed to
@ -716,7 +744,7 @@ Authors:
--------
The Samba Team <samba@samba.org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%if %{make_ldapsmb}
@ -727,7 +755,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
@ -740,7 +768,7 @@ Authors:
--------
Guenther Deschner <guenther at deschner dot de>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%endif
@ -763,7 +791,7 @@ Authors:
--------
Steve French <sfrench at Samba dot org>
Source Timestamp: 2490
Source Timestamp: 2495
Branch : 3.5.6
%endif
@ -795,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
@ -1963,5 +2002,4 @@ fi
/lib/mkinitrd/scripts/boot-cifs.sh
%endif
%endif
%changelog

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d6b52dc170ce6a46575f1f236f1442c9e7a5990d1a5746d08420809ff37b84e1
size 24812
oid sha256:a3ab635ae4e42c8c422b511ca81bab5f018851b087138d5637b8fefea56b4620
size 24816