- dropped repeated %description

[packages/samba.git] / samba.spec

diff --git a/samba.spec b/samba.spec
index 800364f5550d71a346c21b6729f37188d67a73d6..23dcc97293d431cfae64552dba892527e46cdfa1 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -24,7 +24,8 @@
 %bcond_without kerberos5       # without Kerberos V support
 %bcond_without ldap            # without LDAP support
 %bcond_without avahi
-%bcond_without merged_build    # without samba3+samba4 merge
+%bcond_with    merged_build    # without samba3+samba4 merge
+%bcond_without system_libtalloc
                                                                # http://wiki.samba.org/index.php/Franky
 %bcond_with    mks             # with vfs-mks (mksd dependency not distributale)
 %bcond_with    vscan
@@ -34,6 +35,8 @@
 %undefine      with_ads
 %endif
 
+%define        libtalloc_ver   2:2.0.1
+
 %define                vscan_version 0.3.6c-beta5
 Summary:       SMB server
 Summary(cs.UTF-8):     Server SMB
@@ -52,13 +55,13 @@ Summary(tr.UTF-8):  SMB sunucusu
 Summary(uk.UTF-8):     SMB клієнт та сервер
 Summary(zh_CN.UTF-8):  Samba 客户端和服务器
 Name:          samba
-Version:       3.5.4
+Version:       3.5.6
 Release:       1
 Epoch:         1
 License:       GPL v3
 Group:         Networking/Daemons
 Source0:       http://www.samba.org/samba/ftp/stable/%{name}-%{version}.tar.gz
-# Source0-md5: 22c8c977eaa18be50f3878c6d0e0c2f0
+# Source0-md5: bf6c09ea497a166df8bd672db1d8da8f
 Source1:       smb.init
 Source2:       %{name}.pamd
 Source3:       swat.inetd
@@ -92,6 +95,7 @@ BuildRequires:        iconv
 BuildRequires: keyutils-devel
 BuildRequires: libmagic-devel
 BuildRequires: libnscd-devel
+%{?with_system_libtalloc:BuildRequires:        libtalloc-devel >= %{libtalloc_ver}}
 BuildRequires: libtool >= 2:1.4d
 BuildRequires: make >= 3.81
 BuildRequires: ncurses-devel >= 5.2
@@ -339,11 +343,6 @@ Samba-client provides some SMB clients, which complement the build-in
 SMB filesystem in Linux. These allow accessing of SMB shares and
 printing to SMB printers.
 
-%description client -l pt_BR.UTF-8
-O pacote samba-clientes prove alguns clientes SMB, que complementam o
-sistema de arquivos SMB do Linux. Eles permitem o acesso a shares SMB,
-e também, à impressoras SMB.
-
 %description client -l es.UTF-8
 Cliente SMB de Samba.
 
@@ -380,7 +379,11 @@ Summary(pt_BR.UTF-8):      Arquivos em comum entre samba e samba-clients
 Summary(ru.UTF-8):     Файлы, используемые как сервером, так и клиентом Samba
 Summary(uk.UTF-8):     Файли, що використовуються як сервером, так і клієнтом Samba
 Group:         Networking/Daemons
+%if %{without system_libtalloc}
 Requires:      libtalloc >= %{epoch}:%{version}-%{release}
+%else
+Requires:      libtalloc >= %{libtalloc_ver}
+%endif
 Requires:      tdb >= %{epoch}:%{version}-%{release}
 
 %description common
@@ -1073,6 +1076,10 @@ cd source3
        --with-syslog \
        --with-utmp \
        --with-fhs \
+%if %{with system_libtalloc}
+       --with-libtalloc=no \
+       --enable-external-libtalloc=yes \
+%endif
        --without-included-popt \
        --%{?with_merged_build:en}%{!?with_merged_build:dis}able-merged-build \
        --enable-automatic-dependencies \
@@ -1357,8 +1364,6 @@ EOF
 %attr(755,root,root) %{_bindir}/umount.cifs4
 %attr(755,root,root) %{_bindir}/setnttoken4
 %attr(755,root,root) %{_bindir}/smbtorture4
-%attr(755,root,root) %{_sbindir}/cifs.upcall
-%{_mandir}/man8/cifs.upcall.8*
 %endif
 %attr(755,root,root) /sbin/mount.cifs
 %attr(755,root,root) /sbin/umount.cifs
@@ -1372,6 +1377,7 @@ EOF
 %attr(755,root,root) %{_bindir}/smbsh
 %attr(755,root,root) %{_bindir}/smbtar
 %attr(755,root,root) %{_bindir}/smbtree
+%attr(755,root,root) %{_sbindir}/cifs.upcall
 %attr(755,root,root) %{_libdir}/smbwrapper.so
 %{_mandir}/man1/findsmb.1*
 %{_mandir}/man1/nmblookup.1*
@@ -1384,6 +1390,7 @@ EOF
 %{_mandir}/man1/smbtree.1*
 %{_mandir}/man8/net.8*
 %{_mandir}/man8/*mount.cifs.8*
+%{_mandir}/man8/cifs.upcall.8*
 
 %files common
 %defattr(644,root,root,755)
@@ -1474,6 +1481,7 @@ EOF
 %{_includedir}/libsmbclient.h
 %{_includedir}/wbclient.h
 
+%if %{without system_libtalloc}
 %files -n libtalloc
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libtalloc.so.*
@@ -1482,6 +1490,7 @@ EOF
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libtalloc.so
 %{_includedir}/talloc.h
+%endif
 
 %files -n tdb
 %defattr(644,root,root,755)