- build with systemd tevent, with bcond, internal packages left out todo as needed

[packages/samba.git] / samba.spec

diff --git a/samba.spec b/samba.spec
index 05adcc897fb183f98219185402e6ac330ac42194..8e0a7d32599c6c3c7cc1968e8ba36685b612e97b 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -24,6 +24,7 @@
 %bcond_without ldap            # without LDAP support
 %bcond_without avahi
 %bcond_with    merged_build    # without samba3+samba4 merge
+%bcond_without system_libtevent
 %bcond_without system_libtalloc
 %bcond_without system_libtdb
                                                                # http://wiki.samba.org/index.php/Franky
@@ -34,6 +35,12 @@
 %undefine      with_ads
 %endif
 
+%if %{with system_libtevent}
+%define                libtevent_ver   0.9.11
+%else
+%define                libtevent_ver   %{epoch}:%{version}-%{release}
+%endif
+
 %if %{with system_libtalloc}
 %define                libtalloc_ver   2.0.1
 %else
@@ -41,9 +48,9 @@
 %endif
 
 %if %{with system_libtdb}
-%define                libtdb_ver              2:1.2.9
+%define                libtdb_ver      2:1.2.9
 %else
-%define                libtdb_ver              %{epoch}:%{version}-%{release}
+%define                libtdb_ver      %{epoch}:%{version}-%{release}
 %endif
 
 %define                virusfilter_version 0.1.3
@@ -64,13 +71,13 @@ Summary(tr.UTF-8):  SMB sunucusu
 Summary(uk.UTF-8):     SMB клієнт та сервер
 Summary(zh_CN.UTF-8):  Samba 客户端和服务器
 Name:          samba
-Version:       3.6.13
+Version:       3.6.17
 Release:       1
 Epoch:         1
 License:       GPL v3
 Group:         Networking/Daemons
 Source0:       http://www.samba.org/samba/ftp/stable/%{name}-%{version}.tar.gz
-# Source0-md5: b9fe8413cbb6fa4b970a159968db2fb4
+# Source0-md5: c67c3330545c8f1f7ee26e017c28439b
 Source1:       smb.init
 Source2:       %{name}.pamd
 Source3:       swat.inetd
@@ -80,7 +87,7 @@ Source6:      smb.conf
 Source7:       winbind.init
 Source8:       winbind.sysconfig
 Source9:       %{name}-rfc3454.txt
-Source10:      https://github.com/downloads/fumiyas/samba-virusfilter/samba-virusfilter-%{virusfilter_version}.tar.bz2
+Source10:      https://github.com/downloads/fumiyas/samba-virusfilter/%{name}-virusfilter-%{virusfilter_version}.tar.bz2
 # Source10-md5:        a3a30d5fbf309d356e8c5833db680c17
 Patch0:                %{name}-smbwrapper.patch
 Patch1:                %{name}-c++-nofail.patch
@@ -118,6 +125,7 @@ BuildRequires:      python-modules
 BuildRequires: readline-devel >= 4.2
 BuildRequires: rpmbuild(macros) >= 1.304
 BuildRequires: sed >= 4.0
+%{?with_system_libtevent:BuildRequires:        tevent-devel >= %{libtevent_ver}}
 %{?with_system_libtalloc:BuildRequires:        talloc-devel >= %{libtalloc_ver}}
 %{?with_system_libtdb:BuildRequires:   tdb-devel >= %{libtdb_ver}}
 BuildRequires: xfsprogs-devel
@@ -349,8 +357,8 @@ Group:              Applications/Networking
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 %{?with_kerberos5:Requires:    heimdal-libs}
 Requires:      libsmbclient = %{epoch}:%{version}-%{release}
-Obsoletes:     smbfs
 Suggests:      cifs-utils
+Obsoletes:     smbfs
 
 %description client
 Samba-client provides some SMB clients, which complement the build-in
@@ -393,6 +401,7 @@ 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
+Requires:      tevent >= %{libtevent_ver}
 Requires:      talloc >= %{libtalloc_ver}
 Requires:      tdb >= %{libtdb_ver}
 
@@ -809,6 +818,9 @@ Summary(pl.UTF-8):  Schemat LDAP dla samby
 Group:         Networking/Daemons
 Requires(post,postun): sed >= 4.0
 Requires:      openldap-servers
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description -n openldap-schema-samba
 This package contains samba.schema for openldap.
@@ -841,8 +853,8 @@ Documentacja samby w formacie PDF.
 %package -n python-samba
 Summary:       Samba Module for Python
 Group:         Development/Languages/Python
-%pyrequires_eq         python
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Requires:      python
 
 %description -n python-samba
 Samba Module for Python.
@@ -899,6 +911,10 @@ cd source3
        --with-syslog \
        --with-utmp \
        --with-fhs \
+%if %{with system_libtevent}
+       --with-libtevent=no \
+       --enable-external-libtevent=yes \
+%endif
 %if %{with system_libtalloc}
        --with-libtalloc=no \
        --enable-external-libtalloc=yes \