--- rpms/samba/sme10/samba.spec	2018/05/08 16:37:54	1.9
+++ rpms/samba/sme10/samba.spec	2018/05/08 17:00:30	1.10
@@ -6,7 +6,7 @@
 # ctdb is enabled by default, you can disable it with: --without clustering
 %bcond_without clustering
 
-%define main_release 12
+%define main_release 12.1
 
 %define samba_version 4.6.2
 %define talloc_version 2.1.9
@@ -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.
@@ -395,6 +395,7 @@ libraries in the Samba suite.
 %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}-client-libs = %{samba_
 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 @@ install -m 0644 %{SOURCE200} packaging/R
 %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 @@ rm -rf %{buildroot}
 %{_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
@@ -2654,6 +2656,10 @@ rm -rf %{buildroot}
 %endif # with_clustering_support
 
 %changelog
+* Tue May 08 2018 Jean-Philipe Pialasse <tests@pialasse.com> - 4.6.2-12.1.sme
+- import 4.6.2-12 [SME: 10429]
+- import to SME the two last upstream releases [SME: 10326]
+
 * Fri Nov 17 2017 Andreas Schneider <asn@redhat.com> - 4.6.2-12
 - resolves: #1514314 - Fix CVE-2017-14746 and CVE-2017-15275
 
@@ -3351,6 +3357,9 @@ rm -rf %{buildroot}
 - Call ldconfig at libwbclient and -winbind-clients post(un)install time.
 - Fix empty localization files, use %%find_lang to find and %%lang-mark them.
 - Escape macros in %%changelog.
+* Tue May 08 2018 Jean-Philipe Pialasse <tests@pialasse.com> -1.sme
+- fix [SME: ]
+
 - Fix source tarball URL.
 
 * Tue Jun 26 2012 Guenther Deschner <gdeschner@redhat.com> - 2:3.6.6-91