scabrero/samba
SHA256
1
0
Fork 0
forked from pool/samba
Code Pull Requests Activity

- Disable included build of ldb, talloc, tdb, and tevent on post-12.1 systems.

Browse Source 
- BuildRequire libldb1-devel, libtalloc2-devel, libtdb1-devel, and
  libtevent0-devel on post-12.1 systems.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=239
This commit is contained in:
Lars Müller 2012-05-15 10:58:22 +00:00 committed by Git OBS Bridge
parent 682bd9e573
commit 0a484ce829
6 changed files with 125 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build-source-timestamp
View File

@ -1,2 +1,2 @@
2799 2801
Branch : 3.6.5.PTF Branch : 3.6.5

4
patches.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:69e6748aecc26b93e4518843a20136491669ade44337ccb1e6059b7f193d334b oid sha256:cd86be1a627f462a4c312f4dfc000b7e804e7e669affb6aa524a453879fe056a
size 53552 size 53537

14
samba-doc.spec
View File

@ -82,23 +82,31 @@ BuildRequires: pkg-config
%else %else
BuildRequires: pkgconfig BuildRequires: pkgconfig
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210
BuildRequires: libldb1-devel
BuildRequires: libtalloc2-devel
BuildRequires: libtdb1-devel
BuildRequires: libtevent0-devel
%endif
%define samba_ver 3.6.5 %define samba_ver 3.6.5
%define samba_ver_suffix %nil %define samba_ver_suffix %nil
%define samba_ver_full %{samba_ver}%{samba_ver_suffix} %define samba_ver_full %{samba_ver}%{samba_ver_suffix}
%if 0%{?suse_version} && 0%{?suse_version} < 1111 %if 0%{?suse_version} && 0%{?suse_version} < 1111
%define guards_symbols pre_1111 %define guards_symbols pre_1111
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 %if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211
%define libldb_ver 1.0.2 %define libldb_ver 1.0.2
%define libtalloc_ver 2.0.5 %define libtalloc_ver 2.0.5
%define libtdb_ver 1.2.9 %define libtdb_ver 1.2.9
%define libtevent_ver 0.9.11 %define libtevent_ver 0.9.11
%else %else
%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131
%define libldb_ver %{version} %define libldb_ver %{version}
%define libtalloc_ver %{version} %define libtalloc_ver %{version}
%define libtdb_ver %{version} %define libtdb_ver %{version}
%define libtevent_ver %{version} %define libtevent_ver %{version}
%endif %endif
%endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
%define build_make_smp_mflags %{?_smp_mflags} %define build_make_smp_mflags %{?_smp_mflags}
%else %else
@ -451,7 +459,7 @@ This package contains all the Samba documentation as it is not part of
the man pages. the man pages.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%changelog %changelog

7
samba.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon May 15 11:54:41 UTC 2012 - lmuelle@suse.com
- Disable included build of ldb, talloc, tdb, and tevent on post-12.1 systems.
- BuildRequire libldb1-devel, libtalloc2-devel, libtdb1-devel, and
libtevent0-devel on post-12.1 systems.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 2 13:17:54 UTC 2012 - lmuelle@suse.com Wed May 2 13:17:54 UTC 2012 - lmuelle@suse.com

155
samba.spec
View File

@ -82,23 +82,31 @@ BuildRequires: pkg-config
%else %else
BuildRequires: pkgconfig BuildRequires: pkgconfig
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1210
BuildRequires: libldb1-devel
BuildRequires: libtalloc2-devel
BuildRequires: libtdb1-devel
BuildRequires: libtevent0-devel
%endif
%define samba_ver 3.6.5 %define samba_ver 3.6.5
%define samba_ver_suffix %nil %define samba_ver_suffix %nil
%define samba_ver_full %{samba_ver}%{samba_ver_suffix} %define samba_ver_full %{samba_ver}%{samba_ver_suffix}
%if 0%{?suse_version} && 0%{?suse_version} < 1111 %if 0%{?suse_version} && 0%{?suse_version} < 1111
%define guards_symbols pre_1111 %define guards_symbols pre_1111
%endif %endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 %if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211
%define libldb_ver 1.0.2 %define libldb_ver 1.0.2
%define libtalloc_ver 2.0.5 %define libtalloc_ver 2.0.5
%define libtdb_ver 1.2.9 %define libtdb_ver 1.2.9
%define libtevent_ver 0.9.11 %define libtevent_ver 0.9.11
%else %else
%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1131
%define libldb_ver %{version} %define libldb_ver %{version}
%define libtalloc_ver %{version} %define libtalloc_ver %{version}
%define libtdb_ver %{version} %define libtdb_ver %{version}
%define libtevent_ver %{version} %define libtevent_ver %{version}
%endif %endif
%endif
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140
%define build_make_smp_mflags %{?_smp_mflags} %define build_make_smp_mflags %{?_smp_mflags}
%else %else
@ -211,8 +219,8 @@ binary packages of the most current Samba version, and a bug reporting
how to. how to.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%package client %package client
License: GPL-3.0+ License: GPL-3.0+
@ -252,8 +260,8 @@ binary packages of the most current Samba version, and a bug reporting
how to. how to.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@ -272,8 +280,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of Samba. develop programs which make use of Samba.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%endif %endif
%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
@ -297,8 +305,8 @@ This package contains all the Samba documentation as it is not part of
the man pages. the man pages.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%endif %endif
@ -319,8 +327,8 @@ Requires: samba-client >= %{version}
A wrapper binary to run smbspool with the original calling UID. A wrapper binary to run smbspool with the original calling UID.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%if %{make_utils} %if %{make_utils}
@ -335,8 +343,8 @@ Obsoletes: samba-gplv3-utils < %{version}
Some of the debug-tools for developpers. Some of the debug-tools for developpers.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%endif %endif
@ -368,8 +376,8 @@ PreReq: coreutils
This is the winbind-daemon and the wbinfo-tool. This is the winbind-daemon and the wbinfo-tool.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -394,15 +402,15 @@ PreReq: /sbin/ldconfig
%description -n libsmbclient %description -n libsmbclient
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%else %else
%description -n libsmbclient0 %description -n libsmbclient0
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%endif %endif
This package includes the libsmbclient library. This package includes the libsmbclient library.
@ -440,8 +448,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of the smbclient programming interface. develop programs which make use of the smbclient programming interface.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%package -n libnetapi0 %package -n libnetapi0
License: GPL-3.0+ License: GPL-3.0+
@ -453,8 +461,8 @@ PreReq: /sbin/ldconfig
This package includes the netapi library. This package includes the netapi library.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%package -n libnetapi-devel %package -n libnetapi-devel
License: GPL-3.0+ License: GPL-3.0+
@ -472,8 +480,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of the netapi programming interface. develop programs which make use of the netapi programming interface.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%if 0%{?suse_version} && 0%{?suse_version} < 1031 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@ -493,15 +501,15 @@ PreReq: /sbin/ldconfig
%description -n libsmbsharemodes %description -n libsmbsharemodes
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%else %else
%description -n libsmbsharemodes0 %description -n libsmbsharemodes0
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%endif %endif
This package includes the smbsharemodes library. This package includes the smbsharemodes library.
@ -526,8 +534,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of the smbsharemodes programming interface. develop programs which make use of the smbsharemodes programming interface.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%package -n libwbclient0 %package -n libwbclient0
License: LGPL-3.0+ License: LGPL-3.0+
@ -539,8 +547,8 @@ PreReq: /sbin/ldconfig
This package includes the wbclient library. This package includes the wbclient library.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%package -n libwbclient-devel %package -n libwbclient-devel
License: LGPL-3.0+ License: LGPL-3.0+
@ -558,8 +566,10 @@ This package contains the static libraries and header files needed to
develop programs which make use of the wbclient programming interface. develop programs which make use of the wbclient programming interface.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%if 0%{?suse_version} && 0%{?suse_version} < 1211
%package -n libtalloc2 %package -n libtalloc2
Version: %{libtalloc_ver} Version: %{libtalloc_ver}
@ -573,8 +583,8 @@ PreReq: /sbin/ldconfig
This package includes the talloc library. This package includes the talloc library.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%package -n libtalloc-devel %package -n libtalloc-devel
Version: %{libtalloc_ver} Version: %{libtalloc_ver}
@ -594,8 +604,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of the talloc programming interface. develop programs which make use of the talloc programming interface.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%package -n libtdb1 %package -n libtdb1
Version: %{libtdb_ver} Version: %{libtdb_ver}
@ -609,8 +619,8 @@ PreReq: /sbin/ldconfig
This package includes the tdb library. This package includes the tdb library.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%package -n libtdb-devel %package -n libtdb-devel
Version: %{libtdb_ver} Version: %{libtdb_ver}
@ -626,8 +636,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of the tdb programming interface. develop programs which make use of the tdb programming interface.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%package -n libtevent0 %package -n libtevent0
Version: %{libtevent_ver} Version: %{libtevent_ver}
@ -641,8 +651,8 @@ PreReq: /sbin/ldconfig
This package includes the tevent library. This package includes the tevent library.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%package -n libtevent-devel %package -n libtevent-devel
Version: %{libtevent_ver} Version: %{libtevent_ver}
@ -663,8 +673,8 @@ This package contains the static libraries and header files needed to
develop programs which make use of the tevent programming interface. develop programs which make use of the tevent programming interface.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%package -n libldb1 %package -n libldb1
Version: %{libldb_ver} Version: %{libldb_ver}
@ -679,8 +689,8 @@ PreReq: /sbin/ldconfig
This package includes the ldb library. This package includes the ldb library.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%package -n libldb-devel %package -n libldb-devel
Version: %{libldb_ver} Version: %{libldb_ver}
@ -700,9 +710,10 @@ Requires: libtalloc-devel
This package contains the static libraries and header files needed to This package contains the static libraries and header files needed to
develop programs which make use of the tevent programming interface. develop programs which make use of the tevent programming interface.
Source Timestamp: 2801
Branch : 3.6.5
Source Timestamp: 2799 %endif
Branch : 3.6.5.PTF
%if %{make_ldapsmb} %if %{make_ldapsmb}
@ -719,15 +730,15 @@ This tool aims to simplify the administration of a Samba Domain
Controller that uses the ldapsam passdb backend. Controller that uses the ldapsam passdb backend.
Source Timestamp: 2799 Source Timestamp: 2801
Branch : 3.6.5.PTF Branch : 3.6.5
%endif %endif
%prep %prep
%setup -n samba-%{samba_ver_full} -q %setup -n samba-%{samba_ver_full} -q
# check if our library versions from the spec are still current # check if our library versions from the spec are still current
%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1130 %if 0%{?suse_version} > 1130 && 0%{?suse_version} < 1211
grep "^VERSION = '%{libldb_ver}'$" source4/lib/ldb/wscript || \ grep "^VERSION = '%{libldb_ver}'$" source4/lib/ldb/wscript || \
exit 1 exit 1
grep "^VERSION = '%{libtalloc_ver}'$" lib/talloc/wscript || \ grep "^VERSION = '%{libtalloc_ver}'$" lib/talloc/wscript || \
@ -890,6 +901,8 @@ popd
%endif %endif
popd popd
%if 0%{?suse_version} && 0%{?suse_version} < 1211
for lib_dir in tdb talloc; do for lib_dir in tdb talloc; do
pushd lib/${lib_dir} pushd lib/${lib_dir}
./configure \ ./configure \
@ -928,12 +941,16 @@ TDB_LIBS=../../../source3/bin/libtdb.so.1 TDB_CFLAGS=-I../../../lib/tdb/include
make make
popd popd
%endif
%check %check
%if 0%{?suse_version} && 0%{?suse_version} < 1211
for lib_dir in tdb talloc tevent; do for lib_dir in tdb talloc tevent; do
pushd lib/${lib_dir} pushd lib/${lib_dir}
make test make test
popd popd
done done
%endif
pushd source3 pushd source3
make test_shlibs make test_shlibs
make test_nss_modules make test_nss_modules
@ -977,6 +994,9 @@ install -d -m 0755 -p \
%{buildroot}/%{DOCBOOKDIR} \ %{buildroot}/%{DOCBOOKDIR} \
%{buildroot}/%{SWATDIR}/help \ %{buildroot}/%{SWATDIR}/help \
%{buildroot}/%{_datadir}/susehelp/meta/Administration/System %{buildroot}/%{_datadir}/susehelp/meta/Administration/System
%if 0%{?suse_version} && 0%{?suse_version} < 1211
for lib_dir in tdb talloc tevent; do for lib_dir in tdb talloc tevent; do
pushd lib/${lib_dir} pushd lib/${lib_dir}
make install \ make install \
@ -989,9 +1009,15 @@ make -C source4/lib/ldb/ install \
CONFIGDIR=%{CONFIGDIR} CONFIGDIR=%{CONFIGDIR}
# we prefer the s3 binaries of the tdbtools # we prefer the s3 binaries of the tdbtools
rm %{buildroot}/%{_bindir}/tdb{backup,dump,restore,tool} rm %{buildroot}/%{_bindir}/tdb{backup,dump,restore,tool}
%endif
make -C source3/ install \ make -C source3/ install \
DESTDIR=%{buildroot} \ DESTDIR=%{buildroot} \
CONFIGDIR=%{CONFIGDIR} CONFIGDIR=%{CONFIGDIR}
%if 0%{?suse_version} && 0%{?suse_version} < 1211
# libtalloc # libtalloc
#rm %{buildroot}/%{_libdir}/*talloc* #rm %{buildroot}/%{_libdir}/*talloc*
make -C lib/talloc/ install \ make -C lib/talloc/ install \
@ -1004,6 +1030,9 @@ make -C lib/talloc/ install \
rm -r %{buildroot}/%{python_sitearch} \ rm -r %{buildroot}/%{python_sitearch} \
%{buildroot}/%{_libdir}/ldb/lib{t*,p*} \ %{buildroot}/%{_libdir}/ldb/lib{t*,p*} \
%{buildroot}/%{_libdir}/tevent %{buildroot}/%{_libdir}/tevent
%endif
for file in source3/pkgconfig/*.pc; do for file in source3/pkgconfig/*.pc; do
install -m 0644 "${file}" %{buildroot}/%{_libdir}/pkgconfig install -m 0644 "${file}" %{buildroot}/%{_libdir}/pkgconfig
done done
@ -1299,14 +1328,20 @@ fi
%postun -n libnetapi0 -p /sbin/ldconfig %postun -n libnetapi0 -p /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1211
%post -n libtalloc2 -p /sbin/ldconfig %post -n libtalloc2 -p /sbin/ldconfig
%postun -n libtalloc2 -p /sbin/ldconfig %postun -n libtalloc2 -p /sbin/ldconfig
%endif
%post -n libwbclient0 -p /sbin/ldconfig %post -n libwbclient0 -p /sbin/ldconfig
%postun -n libwbclient0 -p /sbin/ldconfig %postun -n libwbclient0 -p /sbin/ldconfig
%if 0%{?suse_version} && 0%{?suse_version} < 1211
%post -n libtdb1 -p /sbin/ldconfig %post -n libtdb1 -p /sbin/ldconfig
%postun -n libtdb1 -p /sbin/ldconfig %postun -n libtdb1 -p /sbin/ldconfig
@ -1318,6 +1353,9 @@ fi
%post -n libldb1 -p /sbin/ldconfig %post -n libldb1 -p /sbin/ldconfig
%postun -n libldb1 -p /sbin/ldconfig %postun -n libldb1 -p /sbin/ldconfig
%endif
%if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110
%pre doc %pre doc
@ -1746,6 +1784,8 @@ fi
%{_libdir}/libsmbsharemodes.so %{_libdir}/libsmbsharemodes.so
%{_libdir}/pkgconfig/smbsharemodes.pc %{_libdir}/pkgconfig/smbsharemodes.pc
%if 0%{?suse_version} && 0%{?suse_version} < 1211
%files -n libtalloc2 %files -n libtalloc2
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libpytalloc-util.so.* %{_libdir}/libpytalloc-util.so.*
@ -1776,6 +1816,8 @@ fi
%{_libdir}/libtdb.so %{_libdir}/libtdb.so
%{_libdir}/pkgconfig/tdb.pc %{_libdir}/pkgconfig/tdb.pc
%endif
%files -n libwbclient0 %files -n libwbclient0
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libwbclient.so.* %{_libdir}/libwbclient.so.*
@ -1788,6 +1830,8 @@ fi
%{_libdir}/libwbclient.so %{_libdir}/libwbclient.so
%{_libdir}/pkgconfig/wbclient.pc %{_libdir}/pkgconfig/wbclient.pc
%if 0%{?suse_version} && 0%{?suse_version} < 1211
%files -n libtevent0 %files -n libtevent0
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/libtevent.so.* %{_libdir}/libtevent.so.*
@ -1813,6 +1857,9 @@ fi
%{_libdir}/libpyldb-util.so %{_libdir}/libpyldb-util.so
%{_libdir}/pkgconfig/ldb.pc %{_libdir}/pkgconfig/ldb.pc
%{_libdir}/pkgconfig/pyldb-util.pc %{_libdir}/pkgconfig/pyldb-util.pc
%endif
%if %{make_ldapsmb} %if %{make_ldapsmb}
%files -n ldapsmb %files -n ldapsmb

4
vendor-files.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:f994a4bd2415e99d0199f8a2610477f2042753007345558a11fee71f4496dd2e oid sha256:1bea4ed6c822816f0a065fc38b1cb7b376176719b76eeb51685d24d0048205e8
size 52523 size 52556