--- samba.spec.jpp 2018-05-08 18:38:40.163337265 +0200 +++ samba.spec 2018-05-08 20:23:54.682747298 +0200 @@ -32,7 +32,7 @@ %global with_internal_talloc 0 %global with_internal_tevent 0 %global with_internal_tdb 0 -%global with_internal_ldb 0 +%global with_internal_ldb 1 %global with_profiling 1 @@ -56,8 +56,8 @@ %global libwbc_alternatives_suffix -64 %endif -%global with_mitkrb5 1 -%global with_dc 0 +%global with_mitkrb5 0 +%global with_dc 1 %if %{with testsuite} # The testsuite only works with a full build right now. @@ -212,7 +212,7 @@ BuildRequires: libcephfs1-devel %endif %if %{with_dc} -BuildRequires: gnutls-devel >= 3.4.7 +BuildRequires: gnutls-devel # Required by samba-tool to run tests BuildRequires: python-crypto %endif @@ -395,6 +395,7 @@ %package vfs-cephfs Summary: Samba VFS module for Ceph distributed storage system Requires: libcephfs1 +Requires: libldb Requires: %{name} = %{samba_depver} Requires: %{name}-libs = %{samba_depver} @@ -499,7 +500,7 @@ Requires: %{name}-libs = %{samba_depver} Requires: python-tevent Requires: python-tdb -Requires: pyldb +#Requires: pyldb Requires: pytalloc Provides: samba4-python = %{samba_depver} @@ -868,8 +869,8 @@ %endif install -d -m 0755 %{buildroot}%{_unitdir} -for i in nmb smb winbind ; do - cat packaging/systemd/$i.service | sed -e 's@\[Service\]@[Service]\nEnvironment=KRB5CCNAME=FILE:/run/samba/krb5cc_samba@g' >tmp$i.service +for i in nmb smb winbind samba; do + cat packaging/systemd/$i.service | sed -e 's@\[Service\]@[Service]\nEnvironment=KRB5CCNAME=/run/samba/krb5cc_samba@g' >tmp$i.service install -m 0644 tmp$i.service %{buildroot}%{_unitdir}/$i.service done %if %with_clustering_support @@ -1483,6 +1484,7 @@ %{_libdir}/samba/ldb/password_hash.so %{_libdir}/samba/ldb/ranged_results.so %{_libdir}/samba/ldb/repl_meta_data.so +%{_unitdir}/samba.service %{_libdir}/samba/ldb/resolve_oids.so %{_libdir}/samba/ldb/rootdse.so %{_libdir}/samba/ldb/samba3sam.so @@ -1537,7 +1539,6 @@ %{_libdir}/samba/libdfs-server-ad-samba4.so %{_libdir}/samba/libdnsserver-common-samba4.so %{_libdir}/samba/libdsdb-module-samba4.so -%{_libdir}/samba/libntvfs-samba4.so %{_libdir}/samba/bind9/dlz_bind9_9.so %else %doc packaging/README.dc-libs @@ -1503,6 +1503,9 @@ %{_libdir}/samba/ldb/tombstone_reanimate.so %{_libdir}/samba/ldb/update_keytab.so %{_libdir}/samba/ldb/wins_ldb.so +%{_libdir}/samba/bind9/dlz_bind9_11.so +%{_libdir}/samba/ldb/dsdb_notification.so +%{_libdir}/samba/ldb/vlv.so %{_libdir}/samba/vfs/posix_eadb.so %dir /var/lib/samba/sysvol %{_datadir}/samba/setup @@ -1539,7 +1542,6 @@ %{_libdir}/samba/libdfs-server-ad-samba4.so %{_libdir}/samba/libdnsserver-common-samba4.so %{_libdir}/samba/libdsdb-module-samba4.so -%{_libdir}/samba/libntvfs-samba4.so %{_libdir}/samba/bind9/dlz_bind9_9.so %else %doc packaging/README.dc-libs