- 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
This commit is contained in:
parent
a7c22044a2
commit
a909c8b767
@ -1,2 +1,2 @@
|
||||
2492
|
||||
2494
|
||||
Branch : 3.5.6
|
||||
|
@ -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 <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%changelog
|
||||
|
61
samba.spec
61
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 <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%package client
|
||||
@ -230,7 +230,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
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 <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%endif
|
||||
@ -287,7 +287,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%endif
|
||||
@ -314,7 +314,7 @@ Authors:
|
||||
--------
|
||||
Jeremy Allison <jra at samba dot org>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%if %{make_utils}
|
||||
@ -364,7 +364,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
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 <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libnetapi0
|
||||
@ -454,7 +454,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libnetapi-devel
|
||||
@ -474,7 +474,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
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 <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libtalloc2
|
||||
@ -552,7 +552,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libtalloc-devel
|
||||
@ -574,7 +574,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libtdb1
|
||||
@ -595,7 +595,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libtdb-devel
|
||||
@ -617,7 +617,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libwbclient0
|
||||
@ -636,7 +636,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libwbclient-devel
|
||||
@ -656,7 +656,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libtevent0
|
||||
@ -677,7 +677,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libtevent-devel
|
||||
@ -700,7 +700,7 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libldb0
|
||||
@ -722,7 +722,7 @@ Authors:
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%package -n libldb-devel
|
||||
@ -744,7 +744,7 @@ Authors:
|
||||
--------
|
||||
The Samba Team <samba@samba.org>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%if %{make_ldapsmb}
|
||||
@ -768,7 +768,7 @@ Authors:
|
||||
--------
|
||||
Guenther Deschner <guenther at deschner dot de>
|
||||
|
||||
Source Timestamp: 2492
|
||||
Source Timestamp: 2494
|
||||
Branch : 3.5.6
|
||||
|
||||
%endif
|
||||
@ -791,7 +791,7 @@ Authors:
|
||||
--------
|
||||
Steve French <sfrench at Samba dot org>
|
||||
|
||||
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
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:88841a6aeb7ce40590c0509438a6524d094290d5f3e87f36d8e4cfcff7ea272b
|
||||
size 24818
|
||||
oid sha256:a007b13c07a4543b5892d74525f51026bde30f6dad05dbf19a52d00a765c61c0
|
||||
size 24827
|
||||
|
Loading…
Reference in New Issue
Block a user