samba-4.10.2-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12080 ec354946-7b23-47d6-9f5a-488ba84defc7

s/samba/samba-vl.spec

@@ -1,20 +1,16 @@
-%define samba_version 4.9.4
+%define samba_version 4.10.2
 #define rc_number rc4
 %define samba_release 1
 
 %define doc_version 4.9.3
 %define api_version 4.0
-%define libwbc_sover 0.14
+%define libwbc_soname 0
+%define libwbc_sover 0.15
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
 
 %global with_libsmbclient 1
 %global with_libwbclient 1
 
-%global with_internal_talloc 0
-%global with_internal_tevent 0
-%global with_internal_tdb 0
-%global with_internal_ldb 0
-
 %global with_mitkrb5 0
 %global with_dc 1
 
@@ -75,12 +71,17 @@ Requires(pre): %{name}-common = %{samba_version}-%{release}
 Conflicts: samba < %{version}
 Provides: samba = %{version}
 
+Obsoletes: libtalloc <= 2.1.14
+Obsoletes: libtevent <= 0.9.37
+Obsoletes: libldb <= 1.4.6
+Obsoletes: ctdb <= 2.5.5
+
 BuildRoot: %{_tmppath}/%{name}-%{samba_version}-%{release}-root
 Requires(post): /sbin/chkconfig, /sbin/service
 Requires(preun): /sbin/chkconfig, /sbin/service
 
 BuildRequires: avahi-devel
-BuildRequires: ctdb-devel
+#BuildRequires: ctdb-devel
 BuildRequires: cups-devel
 BuildRequires: cyrus-sasl-devel
 BuildRequires: docbook-style-xsl
@@ -95,7 +96,7 @@ BuildRequires: jansson-devel
 BuildRequires: keyutils-libs-devel
 BuildRequires: krb5-devel
 BuildRequires: krb5-workstation
-BuildRequires: ldb-tools
+#BuildRequires: ldb-tools
 BuildRequires: libacl-devel
 BuildRequires: libaio-devel
 BuildRequires: libarchive-devel
@@ -104,9 +105,10 @@ BuildRequires: libblkid-devel
 BuildConflicts: libbsd-devel
 BuildRequires: libcap-devel
 BuildRequires: libidn-devel
-BuildRequires: libldb-devel >= 1.1.25
+#BuildRequires: libldb-devel >= 1.1.25
 BuildRequires: libpcap-devel
-BuildRequires: libtevent-devel
+#BuildRequires: libtevent-devel
+BuildRequires: libtirpc-devel
 BuildRequires: libuuid-devel
 BuildRequires: libxcrypt-devel
 BuildRequires: libxml2-devel
@@ -119,12 +121,13 @@ BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(Parse::Yapp)
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
-BuildRequires: python-devel
-BuildRequires: python-gpg
-BuildRequires: python-ldb-devel
-BuildRequires: python-talloc-devel
-BuildRequires: python-tdb
-BuildRequires: python-tevent
+BuildRequires: python3-devel
+BuildRequires: python3-rpm-macros
+BuildRequires: python3-gpg
+BuildRequires: python3-tdb
+#BuildRequires: python3-ldb-devel
+#BuildRequires: python3-talloc-devel
+#BuildRequires: python3-tevent
 BuildRequires: rpcgen
 BuildRequires: readline-devel
 BuildRequires: sqlite-devel
@@ -191,6 +194,7 @@ Summary: Samba Python libraries
 Summary(ja): Python 向け Samba ライブラリ
 Group: System Environment/Libraries
 Requires: %{name}-libs = %{samba_version}
+Provides: %{name}-python3 = %{version}-%{release}
 
 %description python
 The samba4-python package contains the Python libraries needed by programs
@@ -434,12 +438,12 @@ popd
 ## ====================================================================
 %build
 
-%global _talloc_lib ,!talloc,!pytalloc,!pytalloc-util
-%global _tevent_lib ,!tevent,!pytevent
 %global _tdb_lib ,!tdb,!pytdb
-%global _ldb_lib ,!ldb,!pyldb
+%global _talloc_lib ,talloc,pytalloc,pytalloc-util
+%global _tevent_lib ,tevent,pytevent
+%global _ldb_lib ,ldb,pyldb
 
-%global _samba4_libraries heimdal,!zlib,!ctdb,!popt%{_talloc_lib}%{_tevent_lib}%{_tdb_lib}%{_ldb_lib}
+%global _samba4_libraries heimdal,!zlib,ctdb,!popt%{_talloc_lib}%{_tevent_lib}%{_tdb_lib}%{_ldb_lib}
 
 %global _samba4_idmap_modules idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2
 %global _samba4_pdb_modules pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4
@@ -469,6 +473,8 @@ sed \
 make distclean
 
 ##export PATH=$PATH:$PWD/buildtools/bin
+export PYTHON=%{__python3}
+
 LDFLAGS="-Wl,-z,relro,-z,now" \
 %configure \
   --enable-fhs \
@@ -486,7 +492,8 @@ LDFLAGS="-Wl,-z,relro,-z,now" \
   --with-pammodulesdir=%{_lib}/security \
   --with-piddir=/var/run/samba \
   --with-privatedir=/var/lib/samba/private \
-  --with-sockets-dir=/var/run/samba
+  --with-sockets-dir=/var/run/samba \
+  --without-ldb-lmdb
 
 #  --bundled-libraries=NONE \
 #  --with-system-mitkrb5 \
@@ -736,7 +743,9 @@ exit 0
 # It has to be posttrans here to make sure all files of a previous version
 # without alternatives support are removed
 %{_sbindir}/update-alternatives --install %{_libdir}/libwbclient.so.%{libwbc_sover} \
-    libwbclient.so.%{libwbc_sover}%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so.%{libwbc_sover} 10
+    libwbclient.so.%{libwbc_sover}%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so.%{libwbc_sover} 10 \
+    --slave %{_libdir}/libwbclient.so.%{libwbc_soname} \
+    libwbclient.so.%{libwbc_soname}%{libwbc_alternatives_suffix} %{_libdir}/samba/wbclient/libwbclient.so.%{libwbc_soname}
 /sbin/ldconfig
 
 ## --------------------------------------------------------------------
@@ -794,8 +803,15 @@ fi
 %files
 %defattr(-,root,root,-)
 %license COPYING
-%doc PFIF.txt README README.Coding README.contributing VERSION WHATSNEW.txt
+%doc PFIF.txt README.md README.Coding README.contributing VERSION WHATSNEW.txt
 %doc docs-ja/docs-xml/output/htmldocs
+%{_bindir}/dumpmscat
+%{_bindir}/ldbadd
+%{_bindir}/ldbdel
+%{_bindir}/ldbedit
+%{_bindir}/ldbmodify
+%{_bindir}/ldbrename
+%{_bindir}/ldbsearch
 %{_bindir}/mvxattr
 %{_bindir}/smbstatus
 %{_sbindir}/eventlogadm
@@ -811,6 +827,17 @@ fi
 %attr(1777,root,root) %dir /var/spool/samba
 %{_initrddir}/nmb
 %{_initrddir}/smb
+
+%{_mandir}/man1/ldbadd.1*
+%{_mandir}/man1/ldbdel.1*
+%{_mandir}/man1/ldbedit.1*
+%{_mandir}/man1/ldbmodify.1*
+%{_mandir}/man1/ldbrename.1*
+%{_mandir}/man1/ldbsearch.1*
+%{_mandir}/man3/ldb.3*
+
+%{_mandir}/man3/talloc.3.gz
+
 %{_mandir}/man1/mvxattr.1*
 %{_mandir}/man1/smbstatus.1*
 %{_mandir}/man7/samba.7*
@@ -823,10 +850,10 @@ fi
 %{_mandir}/man8/vfs_aio_pthread.8*
 %{_mandir}/man8/vfs_audit.8*
 %{_mandir}/man8/vfs_btrfs.8*
-%{_mandir}/man8/vfs_cacheprime.8*
+#%{_mandir}/man8/vfs_cacheprime.8*
 %{_mandir}/man8/vfs_cap.8*
 %{_mandir}/man8/vfs_catia.8*
-%{_mandir}/man8/vfs_ceph.8*
+#%{_mandir}/man8/vfs_ceph.8*
 %{_mandir}/man8/vfs_commit.8*
 %{_mandir}/man8/vfs_crossrename.8*
 %{_mandir}/man8/vfs_default_quota.8*
@@ -836,14 +863,14 @@ fi
 %{_mandir}/man8/vfs_fileid.8*
 %{_mandir}/man8/vfs_fruit.8*
 %{_mandir}/man8/vfs_full_audit.8*
-%{_mandir}/man8/vfs_glusterfs.8*
-%{_mandir}/man8/vfs_gpfs.8*
+%{_mandir}/man8/vfs_glusterfs_fuse.8*
+#%{_mandir}/man8/vfs_gpfs.8*
 %{_mandir}/man8/vfs_linux_xfs_sgid.8*
 %{_mandir}/man8/vfs_media_harmony.8*
 %{_mandir}/man8/vfs_netatalk.8*
-%{_mandir}/man8/vfs_nfs4acl_xattr.8*
+#%{_mandir}/man8/vfs_nfs4acl_xattr.8*
 %{_mandir}/man8/vfs_offline.8*
-%{_mandir}/man8/vfs_prealloc.8*
+#%{_mandir}/man8/vfs_prealloc.8*
 %{_mandir}/man8/vfs_preopen.8*
 %{_mandir}/man8/vfs_readahead.8*
 %{_mandir}/man8/vfs_readonly.8*
@@ -851,12 +878,12 @@ fi
 %{_mandir}/man8/vfs_shadow_copy.8*
 %{_mandir}/man8/vfs_shadow_copy2.8*
 %{_mandir}/man8/vfs_shell_snap.8*
-%{_mandir}/man8/vfs_snapper.8*
+#%{_mandir}/man8/vfs_snapper.8*
 %{_mandir}/man8/vfs_streams_depot.8*
 %{_mandir}/man8/vfs_streams_xattr.8*
 %{_mandir}/man8/vfs_syncops.8*
 %{_mandir}/man8/vfs_time_audit.8*
-%{_mandir}/man8/vfs_tsmsm.8*
+#%{_mandir}/man8/vfs_tsmsm.8*
 %{_mandir}/man8/vfs_unityed_media.8*
 %{_mandir}/man8/vfs_virusfilter.8*
 %{_mandir}/man8/vfs_worm.8*
@@ -874,10 +901,10 @@ fi
 %{_mandir}/ja/man8/vfs_aio_pthread.8*
 %{_mandir}/ja/man8/vfs_audit.8*
 %{_mandir}/ja/man8/vfs_btrfs.8*
-%{_mandir}/ja/man8/vfs_cacheprime.8*
+%exclude %{_mandir}/ja/man8/vfs_cacheprime.8*
 %{_mandir}/ja/man8/vfs_cap.8*
 %{_mandir}/ja/man8/vfs_catia.8*
-%{_mandir}/ja/man8/vfs_ceph.8*
+%exclude %{_mandir}/ja/man8/vfs_ceph.8*
 %{_mandir}/ja/man8/vfs_commit.8*
 %{_mandir}/ja/man8/vfs_crossrename.8*
 %{_mandir}/ja/man8/vfs_default_quota.8*
@@ -887,14 +914,14 @@ fi
 %{_mandir}/ja/man8/vfs_fileid.8*
 %{_mandir}/ja/man8/vfs_fruit.8*
 %{_mandir}/ja/man8/vfs_full_audit.8*
-%{_mandir}/ja/man8/vfs_glusterfs.8*
-%{_mandir}/ja/man8/vfs_gpfs.8*
-%{_mandir}/ja/man8/vfs_nfs4acl_xattr.8*
+%exclude %{_mandir}/ja/man8/vfs_glusterfs.8*
+%exclude %{_mandir}/ja/man8/vfs_gpfs.8*
+%exclude %{_mandir}/ja/man8/vfs_nfs4acl_xattr.8*
 %{_mandir}/ja/man8/vfs_linux_xfs_sgid.8*
 %{_mandir}/ja/man8/vfs_media_harmony.8*
 %{_mandir}/ja/man8/vfs_netatalk.8*
 %{_mandir}/ja/man8/vfs_offline.8*
-%{_mandir}/ja/man8/vfs_prealloc.8*
+%exclude %{_mandir}/ja/man8/vfs_prealloc.8*
 %{_mandir}/ja/man8/vfs_preopen.8*
 %{_mandir}/ja/man8/vfs_readahead.8*
 %{_mandir}/ja/man8/vfs_readonly.8*
@@ -902,12 +929,12 @@ fi
 %{_mandir}/ja/man8/vfs_shadow_copy.8*
 %{_mandir}/ja/man8/vfs_shadow_copy2.8*
 %{_mandir}/ja/man8/vfs_shell_snap.8*
-%{_mandir}/ja/man8/vfs_snapper.8*
+%exclude %{_mandir}/ja/man8/vfs_snapper.8*
 %{_mandir}/ja/man8/vfs_streams_depot.8*
 %{_mandir}/ja/man8/vfs_streams_xattr.8*
 %{_mandir}/ja/man8/vfs_syncops.8*
 %{_mandir}/ja/man8/vfs_time_audit.8*
-%{_mandir}/ja/man8/vfs_tsmsm.8*
+%exclude %{_mandir}/ja/man8/vfs_tsmsm.8*
 %{_mandir}/ja/man8/vfs_unityed_media.8*
 %{_mandir}/ja/man8/vfs_virusfilter.8*
 %{_mandir}/ja/man8/vfs_worm.8*
@@ -934,6 +961,18 @@ fi
 %{_libdir}/libsmbldap.so.*
 %{_libdir}/libtevent-util.so.*
 
+# talloc
+%{_libdir}/samba/libtalloc.so*
+%{_libdir}/samba/libpytalloc-util.*.so.*
+
+# tevent
+%{_libdir}/samba/libtevent.so*
+
+# ldb
+%{_libdir}/samba/libldb.so*
+%{_libdir}/samba/libldb-*.so*
+%{_libdir}/samba/libpyldb-util.*.so.*
+
 # libraries needed by the public libraries
 %dir %{_libdir}/samba
 %{_libdir}/samba/libCHARSET3-samba4.so
@@ -956,6 +995,7 @@ fi
 %{_libdir}/samba/libcli-smb-common-samba4.so
 %{_libdir}/samba/libcli-spoolss-samba4.so
 %{_libdir}/samba/libcliauth-samba4.so
+%{_libdir}/samba/libclidns-samba4.so
 %{_libdir}/samba/libcluster-samba4.so
 %{_libdir}/samba/libcmdline-contexts-samba4.so
 %{_libdir}/samba/libcmdline-credentials-samba4.so
@@ -990,6 +1030,7 @@ fi
 %{_libdir}/samba/liblibsmb-samba4.so
 %{_libdir}/samba/libmessages-dgm-samba4.so
 %{_libdir}/samba/libmessages-util-samba4.so
+%{_libdir}/samba/libmscat-samba4.so
 %{_libdir}/samba/libmsghdr-samba4.so
 %{_libdir}/samba/libmsrpc3-samba4.so
 %{_libdir}/samba/libnon-posix-acls-samba4.so
@@ -1008,7 +1049,7 @@ fi
 %{_libdir}/samba/libsamba-cluster-support-samba4.so
 %{_libdir}/samba/libsamba-debug-samba4.so
 %{_libdir}/samba/libsamba-modules-samba4.so
-%{_libdir}/samba/libsamba-python-samba4.so
+%{_libdir}/samba/libsamba-python.cpython-*-samba4.so
 %{_libdir}/samba/libsamba-security-samba4.so
 %{_libdir}/samba/libsamba-sockets-samba4.so
 %{_libdir}/samba/libsamba3-util-samba4.so
@@ -1100,10 +1141,10 @@ fi
 # dc
 %{_libdir}/libdcerpc-samr.so.*
 %{_libdir}/libdcerpc-server.so.*
-%{_libdir}/libsamba-policy.so.*
+%{_libdir}/libsamba-policy.*.so.*
 %{_libdir}/samba/libHDB-SAMBA4-samba4.so
 %{_libdir}/samba/libdnsserver-common-samba4.so
-%{_libdir}/samba/libsamba-net-samba4.so
+%{_libdir}/samba/libsamba-net.cpython-*-samba4.so
 %{_libdir}/samba/libscavenge-dns-records-samba4.so
 
 ## --------------------------------------------------------------------
@@ -1123,7 +1164,8 @@ fi
 %{_libdir}/samba/libheimntlm-samba4.so.*
 %{_libdir}/samba/libkdc-samba4.so.*
 %{_libdir}/samba/libpac-samba4.so
-%{_libdir}/samba/ldb
+%dir %{_libdir}/samba/ldb
+%{_libdir}/samba/ldb/*
 %{_libdir}/samba/process_model
 %{_libdir}/samba/service
 %dir /var/lib/samba/sysvol
@@ -1357,16 +1399,17 @@ fi
 %{samba_includedir}/util/byteorder.h
 %{samba_includedir}/util/data_blob.h
 %{samba_includedir}/util/debug.h
+%{samba_includedir}/util/discard.h
 %{samba_includedir}/util/fault.h
 %{samba_includedir}/util/genrand.h
 %{samba_includedir}/util/idtree.h
 %{samba_includedir}/util/idtree_random.h
-%{samba_includedir}/util/memory.h
-%{samba_includedir}/util/safe_string.h
+#%{samba_includedir}/util/memory.h
+#%{samba_includedir}/util/safe_string.h
 %{samba_includedir}/util/signal.h
 %{samba_includedir}/util/string_wrappers.h
 %{samba_includedir}/util/substitute.h
-%{samba_includedir}/util/talloc_stack.h
+#%{samba_includedir}/util/talloc_stack.h
 %{samba_includedir}/util/tevent_ntstatus.h
 %{samba_includedir}/util/tevent_unix.h
 %{samba_includedir}/util/tevent_werror.h
@@ -1384,7 +1427,7 @@ fi
 %{_libdir}/libsamba-credentials.so
 %{_libdir}/libsamba-hostconfig.so
 %{_libdir}/libsamba-passdb.so
-%{_libdir}/libsamba-policy.so
+%{_libdir}/libsamba-policy.*.so
 %{_libdir}/libsamba-util.so
 %{_libdir}/libsamdb.so
 %{_libdir}/libsmbconf.so
@@ -1399,7 +1442,7 @@ fi
 %{_libdir}/pkgconfig/netapi.pc
 %{_libdir}/pkgconfig/samba-credentials.pc
 %{_libdir}/pkgconfig/samba-hostconfig.pc
-%{_libdir}/pkgconfig/samba-policy.pc
+%{_libdir}/pkgconfig/samba-policy.*.pc
 %{_libdir}/pkgconfig/samba-util.pc
 %{_libdir}/pkgconfig/samdb.pc
 
@@ -1409,7 +1452,7 @@ fi
 ## --------------------------------------------------------------------
 %files python
 %defattr(-,root,root,-)
-%{python_sitearch}/*
+%{python3_sitearch}/*
 #%exclude %{python_sitearch}/_ldb.so
 #%exclude %{python_sitearch}/_tevent.so
 
@@ -1600,6 +1643,11 @@ fi
 %endif
 
 %changelog
+* Sat May 11 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.10.2-1
+- new upstream release.
+- switched to python3.
+- made to use bundled lib{talloc,tevent,ldb} and ctdb.
+
 * Fri Jan 25 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.9.4-1
 - new upstream release.