X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=samba.spec;h=6e21931addc7b2906323225d755605ea14b88961;hb=ba296f9;hp=ecbfde693b391ac95209b51908a1678fc1a43881;hpb=0ebc6d9d8ae51d0e92b566c5422bd27e5f50d864;p=packages%2Fsamba.git

diff --git a/samba.spec b/samba.spec
index ecbfde6..6e21931 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,3 +1,6 @@
+# TODO:
+# - bcond/subpackage for Spotlight tracker backend (BR: glib2-devel tracker-devel >= 2.0)?
+# - gpfs.h (nfs-ganesha?)
 #
 # Note:
 # - unpredictible build failures:
@@ -8,10 +11,12 @@
 %bcond_without	ads		# ActiveDirectory support
 %bcond_without	ceph		# Ceph (RADOS) storage support
 %bcond_without	cups		# CUPS support
+%bcond_without	glusterfs	# GlusterFS storage support
 %bcond_without	ldap		# LDAP support
 %bcond_without	avahi		# Avahi support
 %bcond_without	dmapi		# DMAPI support
 %bcond_without	systemd		# systemd integration
+%bcond_without	winexe		# winexe tool
 %bcond_with	system_heimdal	# Use system Heimdal libraries [since samba 4.4.x build fails with heimdal 1.5.x/7.x]
 %bcond_with	system_libbsd	# system libbsd for MD5 and strl* functions
 %bcond_without	system_libs	# system libraries from SAMBA project (talloc,tdb,tevent,ldb)
@@ -20,10 +25,10 @@
 %bcond_with	replace
 
 %if %{with system_libs}
-%define		ldb_ver		1.4.6
-%define		talloc_ver	2:2.1.14
-%define		tdb_ver		2:1.3.16
-%define		tevent_ver	0.9.37
+%define		ldb_ver		2.2.1
+%define		talloc_ver	2:2.3.1
+%define		tdb_ver		2:1.4.3
+%define		tevent_ver	0.10.2
 %endif
 
 # dmapi-devel with xfsprogs-devel >= 4.11(?) needs largefile (64bit off_t) that isn't detected properly
@@ -31,20 +36,19 @@
 %undefine	with_dmapi
 %endif
 
-%include	/usr/lib/rpm/macros.perl
 
 # NOTE: packages order is: server + additions, common, clients, libs+devel, ldap
 %define		virusfilter_version 0.1.4
 Summary:	Samba Active Directory and SMB server
 Summary(pl.UTF-8):	Serwer Samba Active Directory i SMB
 Name:		samba
-Version:	4.9.5
+Version:	4.13.7
 Release:	1
 Epoch:		1
 License:	GPL v3
 Group:		Networking/Daemons
-Source0:	https://www.samba.org/ftp/samba/samba-%{version}.tar.gz
-# Source0-md5:	e761ba58bdbcb903bd3692283d46103a
+Source0:	https://download.samba.org/pub/samba/stable/%{name}-%{version}.tar.gz
+# Source0-md5:	1a900f45d5251b53c9bd28887e588583
 Source1:	smb.init
 Source2:	samba.pamd
 Source4:	samba.sysconfig
@@ -58,7 +62,6 @@ Source10:	https://bitbucket.org/fumiyas/samba-virusfilter/downloads/samba-virusf
 Patch0:		system-heimdal.patch
 Patch1:		%{name}-c++-nofail.patch
 Patch2:		%{name}-lprng-no-dot-printers.patch
-
 Patch4:		unicodePwd-nthash-values-over-LDAP.patch
 Patch5:		%{name}-heimdal.patch
 Patch6:		server-role.patch
@@ -67,34 +70,51 @@ Patch8:		%{name}-no_libbsd.patch
 URL:		https://www.samba.org/
 BuildRequires:	acl-devel
 %{?with_avahi:BuildRequires:	avahi-devel}
-%{?with_ceph:BuildRequires:	ceph-devel >= 0.73}
-BuildRequires:	cmocka-devel >= 1.0.0
+BuildRequires:	bison
+%{?with_ceph:BuildRequires:	ceph-devel >= 11}
+BuildRequires:	cmocka-devel >= 1.1.3
+%if %{with winexe}
+BuildRequires:	crossmingw32-gcc
+BuildRequires:	crossmingw64-gcc
+%endif
 %{?with_cups:BuildRequires:	cups-devel >= 1:1.2.0}
 BuildRequires:	cyrus-sasl-devel >= 2
 BuildRequires:	dbus-devel
 %{?with_dmapi:BuildRequires:	dmapi-devel}
 BuildRequires:	docbook-style-xsl-nons
+BuildRequires:	flex
 # just FAM API
 BuildRequires:	gamin-devel
-BuildRequires:	gdbm-devel
 BuildRequires:	gettext-tools
-BuildRequires:	glusterfs-devel
-BuildRequires:	gnutls-devel >= 3.0.0
+BuildRequires:	glib2-devel >= 2.0
+%{?with_glusterfs:BuildRequires:	glusterfs-devel >= 4}
+BuildRequires:	gnutls-devel >= 3.4.7
+BuildRequires:	gpgme-devel
 %{?with_system_heimdal:BuildRequires:	heimdal-devel >= 1.5.3-1}
 BuildRequires:	iconv
+BuildRequires:	jansson-devel
 BuildRequires:	keyutils-devel
 BuildRequires:	libaio-devel
 BuildRequires:	libarchive-devel >= 3.1.2
 %{?with_system_libbsd:BuildRequires:	libbsd-devel}
 BuildRequires:	libcap-devel
 BuildRequires:	libcom_err-devel
+BuildRequires:	libicu-devel
 BuildRequires:	libmagic-devel
 BuildRequires:	libnscd-devel
+BuildRequires:	libnsl-devel
+BuildRequires:	libtasn1-devel >= 3.8
+BuildRequires:	libtirpc-devel
+BuildRequires:	libunwind-devel
+BuildRequires:	liburing-devel
+BuildRequires:	lttng-ust-devel
 BuildRequires:	make >= 3.81
 BuildRequires:	ncurses-devel >= 5.2
 BuildRequires:	ncurses-ext-devel >= 5.2
 BuildRequires:	nss_wrapper >= 1.0.2
 %{?with_ldap:BuildRequires:	openldap-devel >= 2.3.0}
+# detected and used for linking, but dropped by -Wl,--as-needed
+#BuildRequires:	openssl-devel
 BuildRequires:	pam-devel >= 0.99.8.1
 %{?with_ctdb_pcp:BuildRequires:	pcp-devel}
 BuildRequires:	perl-ExtUtils-MakeMaker
@@ -102,28 +122,32 @@ BuildRequires:	perl-Parse-Yapp >= 1.05
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 %{?with_pgsql:BuildRequires:	postgresql-devel}
-BuildRequires:	python-devel >= 1:2.5.0
-BuildRequires:	python-dns
-BuildRequires:	python-iso8601
-BuildRequires:	python-modules >= 1:2.5.0
-BuildRequires:	python-subunit
-BuildRequires:	python-testtools
+BuildRequires:	python3-devel >= 1:3.5
+BuildRequires:	python3-dns
+BuildRequires:	python3-iso8601
+BuildRequires:	python3-modules >= 1:3.5
+BuildRequires:	python3-subunit
+BuildRequires:	python3-testtools
 BuildRequires:	readline-devel >= 4.2
+BuildRequires:	rpcsvc-proto
+BuildRequires:	rpm-build >= 4.6
 BuildRequires:	rpm-perlprov
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.647
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	sed >= 4.0
 BuildRequires:	socket_wrapper >= 1.1.2
 BuildRequires:	subunit-devel
 %{?with_systemd:BuildRequires:	systemd-devel}
+BuildRequires:	tracker-devel >= 2.0
 BuildRequires:	xfsprogs-devel
 BuildRequires:	zlib-devel >= 1.2.3
 %if %{with system_libs}
 BuildRequires:	ldb-devel >= %{ldb_ver}
-BuildRequires:	ldb-devel < 1.5
-BuildRequires:	python-ldb-devel >= %{ldb_ver}
-BuildRequires:	python-talloc-devel >= %{talloc_ver}
-BuildRequires:	python-tevent >= %{tevent_ver}
+BuildRequires:	ldb-devel < 2.3
+BuildRequires:	python3-ldb-devel >= %{ldb_ver}
+BuildRequires:	python3-talloc-devel >= %{talloc_ver}
+BuildRequires:	python3-tdb >= %{tdb_ver}
+BuildRequires:	python3-tevent >= %{tevent_ver}
 BuildRequires:	talloc-devel >= %{talloc_ver}
 BuildRequires:	tdb-devel >= %{tdb_ver}
 BuildRequires:	tevent-devel >= %{tevent_ver}
@@ -135,44 +159,44 @@ Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 # for samba_{dnsupdate,kcc,spnupdate,upgradedns} scripts
 Requires:	logrotate >= 3.7-4
 Requires:	pam >= 0.99.8.1
-Requires:	python-samba = %{epoch}:%{version}-%{release}
+Requires:	python3-samba = %{epoch}:%{version}-%{release}
 Requires:	rc-scripts >= 0.4.0.12
 Requires:	setup >= 2.4.6-7
 Requires:	systemd-units >= 38
 # smbd links with libcups
 %{?with_cups:Requires:	cups-lib >= 1:1.2.0}
-Obsoletes:	samba-doc-html
-Obsoletes:	samba-doc-pdf
-Obsoletes:	samba-pdb-xml
-Obsoletes:	samba-vfs-audit
-Obsoletes:	samba-vfs-block
-Obsoletes:	samba-vfs-cap
-Obsoletes:	samba-vfs-catia
-Obsoletes:	samba-vfs-default_quota
-Obsoletes:	samba-vfs-expand_msdfs
-Obsoletes:	samba-vfs-fake_perms
-Obsoletes:	samba-vfs-netatalk
-Obsoletes:	samba-vfs-readahead
-Obsoletes:	samba-vfs-readonly
-Obsoletes:	samba-vfs-recycle
-Obsoletes:	samba-vfs-scannedonly
-Obsoletes:	samba-vfs-shadow_copy
-Obsoletes:	samba3
-Obsoletes:	samba3-server
-Obsoletes:	samba3-vfs-audit
-Obsoletes:	samba3-vfs-cap
-Obsoletes:	samba3-vfs-catia
-Obsoletes:	samba3-vfs-default_quota
-Obsoletes:	samba3-vfs-expand_msdfs
-Obsoletes:	samba3-vfs-fake_perms
-Obsoletes:	samba3-vfs-netatalk
-Obsoletes:	samba3-vfs-readahead
-Obsoletes:	samba3-vfs-readonly
-Obsoletes:	samba3-vfs-recycle
-Obsoletes:	samba3-vfs-scannedonly
-Obsoletes:	samba3-vfs-shadow_copy
-Obsoletes:	samba4
-Obsoletes:	samba4-common-server
+Obsoletes:	samba-doc-html < 1:4
+Obsoletes:	samba-doc-pdf < 1:4
+Obsoletes:	samba-pdb-xml < 3.0.23
+Obsoletes:	samba-vfs-audit < 1:4.1.4-3
+Obsoletes:	samba-vfs-block < 1:4.1.4-3
+Obsoletes:	samba-vfs-cap < 1:4.1.4-3
+Obsoletes:	samba-vfs-catia < 1:4.1.4-3
+Obsoletes:	samba-vfs-default_quota < 1:4.1.4-3
+Obsoletes:	samba-vfs-expand_msdfs < 1:4.1.4-3
+Obsoletes:	samba-vfs-fake_perms < 1:4.1.4-3
+Obsoletes:	samba-vfs-netatalk < 1:4.1.4-3
+Obsoletes:	samba-vfs-readahead < 1:4.1.4-3
+Obsoletes:	samba-vfs-readonly < 1:4.1.4-3
+Obsoletes:	samba-vfs-recycle < 1:4.1.4-3
+Obsoletes:	samba-vfs-scannedonly < 1:4.1.4-3
+Obsoletes:	samba-vfs-shadow_copy < 1:4.1.4-3
+Obsoletes:	samba3 < 1:4.1.4-3
+Obsoletes:	samba3-server < 1:4.1.4-3
+Obsoletes:	samba3-vfs-audit < 1:4.1.4-3
+Obsoletes:	samba3-vfs-cap < 1:4.1.4-3
+Obsoletes:	samba3-vfs-catia < 1:4.1.4-3
+Obsoletes:	samba3-vfs-default_quota < 1:4.1.4-3
+Obsoletes:	samba3-vfs-expand_msdfs < 1:4.1.4-3
+Obsoletes:	samba3-vfs-fake_perms < 1:4.1.4-3
+Obsoletes:	samba3-vfs-netatalk < 1:4.1.4-3
+Obsoletes:	samba3-vfs-readahead < 1:4.1.4-3
+Obsoletes:	samba3-vfs-readonly < 1:4.1.4-3
+Obsoletes:	samba3-vfs-recycle < 1:4.1.4-3
+Obsoletes:	samba3-vfs-scannedonly < 1:4.1.4-3
+Obsoletes:	samba3-vfs-shadow_copy < 1:4.1.4-3
+Obsoletes:	samba4 < 1:4.1.4-3
+Obsoletes:	samba4-common-server < 1:4.1.4-3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sambahome	/home/services/samba
@@ -206,6 +230,7 @@ Summary:	VFS module to host shares on Ceph file system
 Summary(pl.UTF-8):	Moduł VFS do serwowania zasobów z systemu plików Ceph
 Group:		Networking/Daemons
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	ceph-libs >= 11
 
 %description vfs-ceph
 VFS module to host shares on Ceph file system.
@@ -238,9 +263,9 @@ Summary(pl.UTF-8):	Pliki używane przez serwer i klientów Samby
 Group:		Networking/Daemons
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 # for samba-tool script
-Requires:	python-samba = %{epoch}:%{version}-%{release}
-Obsoletes:	samba3-common
-Obsoletes:	samba4-common
+Requires:	python3-samba = %{epoch}:%{version}-%{release}
+Obsoletes:	samba3-common < 1:4.1.4-3
+Obsoletes:	samba4-common < 1:4.1.4-3
 
 %description common
 Samba-common provides files necessary for both the server and client
@@ -259,8 +284,8 @@ Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 %{?with_system_heimdal:Requires:	heimdal-libs >= 1.5.3-1}
 Requires:	libsmbclient = %{epoch}:%{version}-%{release}
 Suggests:	cifs-utils
-Obsoletes:	samba3-client
-Obsoletes:	samba4-client
+Obsoletes:	samba3-client < 1:4.1.4-3
+Obsoletes:	samba4-client < 1:4.1.4-3
 Obsoletes:	smbfs
 
 %description client
@@ -282,10 +307,10 @@ Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	systemd-units >= 38
-Obsoletes:	samba3-winbind
-Obsoletes:	samba4-winbind
+Obsoletes:	samba3-winbind < 1:4.1.4-3
+Obsoletes:	samba4-winbind < 1:4.1.4-3
 # pam_winbind is not complete replacement, but pam_smbpass has been removed (in samba 4.4)
-#Obsoletes:	pam-pam_smbpass
+#Obsoletes:	pam-pam_smbpass < 1:4.4
 
 %description winbind
 Provides the winbind daemon and testing tools to allow authentication
@@ -302,7 +327,7 @@ Summary(pl.UTF-8):	Backend CUPS-a drukujący na drukarkach SMB
 Group:		Applications/Printing
 Requires:	%{name}-client = %{epoch}:%{version}-%{release}
 Requires:	cups >= 1:1.2.0
-Obsoletes:	cups-backend-smb3
+Obsoletes:	cups-backend-smb3 < 1:4.1.4-3
 
 %description -n cups-backend-smb
 CUPS backend for printing to SMB printers.
@@ -316,7 +341,7 @@ Summary(pl.UTF-8):	Usługa Name Service Switch dla WINS
 Group:		Base
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes:	nss_wins3
+Obsoletes:	nss_wins3 < 1:4.1.4-3
 
 %description -n nss_wins
 Provides the libnss_wins shared library which resolves NetBIOS names
@@ -331,7 +356,7 @@ Summary:	A utility for retrieving files using the SMB protocol
 Summary(pl.UTF-8):	Narzędzie do pobierania plików protokołem SMB
 Group:		Applications/Networking
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes:	smbget3
+Obsoletes:	smbget3 < 1:4.1.4-3
 
 %description -n smbget
 wget-like utility for downloading files over SMB.
@@ -344,14 +369,16 @@ używanym w sieciach MS Windows.
 Summary:	Samba shared libraries
 Summary(pl.UTF-8):	Biblioteki współdzielone Samby
 Group:		Libraries
-Requires:	gnutls >= 3.0.0
+Requires:	gnutls >= 3.4.7
 %if %{with system_libs}
 Requires:	ldb >= %{ldb_ver}
 Requires:	talloc >= %{talloc_ver}
 Requires:	tdb >= %{tdb_ver}
 Requires:	tevent >= %{tevent_ver}
 %endif
-Obsoletes:	samba-vfs-notify_fam
+# samba 4.11+ dropped support for python2
+Obsoletes:	python-samba < 1:4.11
+Obsoletes:	samba-vfs-notify_fam < 1:4.4.4
 
 %description libs
 Samba shared libraries.
@@ -364,8 +391,8 @@ Summary:	Header files for Samba
 Summary(pl.UTF-8):	Pliki nagłówkowe Samby
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes:	samba3-devel
-Obsoletes:	samba4-devel
+Obsoletes:	samba3-devel < 1:4.1.4-3
+Obsoletes:	samba4-devel < 1:4.1.4-3
 
 %description devel
 Header files for Samba.
@@ -377,7 +404,7 @@ Pliki nagłówkowe Samby.
 Summary:	Perl IDL compiler
 Summary(pl.UTF-8):	Kompilator IDL w Perlu
 Group:		Development/Tools
-Obsoletes:	samba4-pidl
+Obsoletes:	samba4-pidl < 1:4.1.4-3
 
 %description pidl
 The samba-pidl package contains the Perl IDL compiler used by Samba
@@ -387,28 +414,27 @@ and Wireshark to parse IDL and similar protocols.
 Ten pakiet zawiera kompilator IDL napisany w Perlu, używany przez
 Sambę oraz Wiresharka to analizy IDL i podobnych protokołów.
 
-%package -n python-samba
-Summary:	Samba modules for Python
-Summary(pl.UTF-8):	Moduły Samby dla Pythona
+%package -n python3-samba
+Summary:	Samba modules for Python 3
+Summary(pl.UTF-8):	Moduły Samby dla Pythona 3
 Group:		Development/Languages/Python
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Requires:	python
-Requires:	python-dns
-Requires:	python-iso8601
-Requires:	python-modules
+Requires:	python3 >= 1:3.4
+Requires:	python3-dns
+Requires:	python3-iso8601
+Requires:	python3-modules >= 1:3.5
 %if %{with system_libs}
-Requires:	python-ldb >= %{ldb_ver}
-Requires:	python-talloc >= %{talloc_ver}
-Requires:	python-tevent >= %{tevent_ver}
+Requires:	python3-ldb >= %{ldb_ver}
+Requires:	python3-talloc >= %{talloc_ver}
+Requires:	python3-tevent >= %{tevent_ver}
 %endif
-Obsoletes:	python-samba4
 
-%description -n python-samba
-Samba modules for Python.
+%description -n python3-samba
+Samba modules for Python3.
 
-%description -n python-samba -l pl.UTF-8
-Moduły Samby dla Pythona.
+%description -n python3-samba -l pl.UTF-8
+Moduły Samby dla Pythona 3.
 
 %package test
 Summary:	Testing tools for Samba servers and clients
@@ -418,9 +444,9 @@ Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	%{name}-winbind = %{epoch}:%{version}-%{release}
-Obsoletes:	samba4-test
-Obsoletes:	samba4-test-devel
-Obsoletes:	samba-test-devel
+Obsoletes:	samba4-test < 1:4.1.4-3
+Obsoletes:	samba4-test-devel < 1:4.1.4-3
+Obsoletes:	samba-test-devel < 1:4.5.1-3
 
 %description test
 samba-test provides testing tools for both the server and client
@@ -434,7 +460,7 @@ Summary:	libsmbclient and libwbclient - Samba client libraries
 Summary(pl.UTF-8):	libsmbclient i libwbclient - biblioteki klienckie Samby
 Group:		Libraries
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
-Obsoletes:	samba3-libsmbclient
+Obsoletes:	samba3-libsmbclient < 1:4.1.4-3
 
 %description -n libsmbclient
 libsmbclient and libwbclient - libraries that allow to use Samba
@@ -449,8 +475,8 @@ Summary:	Development files for Samba client libraries
 Summary(pl.UTF-8):	Pliki programistyczne bibliotek klienta Samby
 Group:		Development/Libraries
 Requires:	libsmbclient = %{epoch}:%{version}-%{release}
-Obsoletes:	libsmbclient-static
-Obsoletes:	samba3-libsmbclient-devel
+Obsoletes:	libsmbclient-static < 1:4
+Obsoletes:	samba3-libsmbclient-devel < 1:4.1.4-3
 
 %description -n libsmbclient-devel
 Header files for libsmbclient and libwbclient libraries.
@@ -464,10 +490,8 @@ Summary(pl.UTF-8):	Schemat LDAP dla Samby
 Group:		Networking/Daemons
 Requires(post,postun):	sed >= 4.0
 Requires:	openldap-servers
-Obsoletes:	openldap-schema-samba3
-%if "%{_rpmversion}" >= "5"
+Obsoletes:	openldap-schema-samba3 < 1:4.1.4-3
 BuildArch:	noarch
-%endif
 
 %description -n openldap-schema-samba
 This package contains samba.schema for OpenLDAP.
@@ -535,15 +559,16 @@ wyeksportowania do PMCD.
 %{?with_system_heimdal:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1
-
 %patch4 -p1
 %{?with_system_heimdal:%patch5 -p1}
 %patch6 -p1
 %patch7 -p1
 %{!?with_system_libbsd:%patch8 -p1}
 
-%{__sed} -i -e 's|#!/usr/bin/env python|#!/usr/bin/python|' source4/scripting/bin/samba*
-%{__sed} -i -e 's|#!/usr/bin/env perl|#!/usr/bin/perl|' pidl/pidl
+%{__sed} -i -e '1s|#!/usr/bin/env bash|#!/bin/bash|' ctdb/tools/onnode
+%{__sed} -i -e '1s|#!/usr/bin/env perl|#!/usr/bin/perl|' pidl/pidl
+%{__sed} -i -e '/sed_expr1/ s|/usr/bin/env perl|/usr/bin/perl|' source3/script/wscript_build
+%{__sed} -i -e '1s|#!/usr/bin/env python|#!/usr/bin/python|' source4/scripting/bin/samba*
 
 %if %{with system_heimdal}
 %{__mv} source4/heimdal_build/krb5-types{,-smb}.h
@@ -608,6 +633,7 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
 	--with-winbind \
 	--%{?with_avahi:en}%{!?with_avahi:dis}able-avahi \
 	--enable-cups \
+	%{__enable_disable glusterfs} \
 	--enable-iprint
 
 %{__make} V=1
@@ -631,16 +657,11 @@ install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,pam.d,security,sysconfig
 	DESTDIR=$RPM_BUILD_ROOT \
 	CONFIGDIR=$RPM_BUILD_ROOT%{_sysconfdir}/samba
 
-# Undo the PIDL install, we want to try again with the right options.
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/perl5
-
 # Install PIDL
 %{__make} -C pidl install \
 	PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # Clean out crap left behind by the PIDL install
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorlib}/wscript_build
-%{__rm} -r $RPM_BUILD_ROOT%{perl_vendorlib}/Parse/Yapp
 %{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Parse/Pidl/.packlist
 
 install -p source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_sbindir}
@@ -664,7 +685,6 @@ echo "LDB_MODULES_PATH=%{_libdir}/samba/ldb" > $RPM_BUILD_ROOT/etc/env.d/LDB_MOD
 
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libnss_winbind.so* $RPM_BUILD_ROOT/%{_lib}
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/libnss_wins.so* $RPM_BUILD_ROOT/%{_lib}
-install -p bin/vfstest $RPM_BUILD_ROOT%{_bindir}
 
 touch $RPM_BUILD_ROOT/var/lib/samba/{wins.dat,browse.dat}
 
@@ -691,19 +711,18 @@ cp -p examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir}
 # remove man pages for not installed commands
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1*
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man7/traffic_{learner,replay}.7*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_cacheprime.8*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_gpfs.8*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_prealloc.8*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_tsmsm.8*
+#%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_cacheprime.8*
+#%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_gpfs.8*
+#%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_prealloc.8*
+#%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_tsmsm.8*
 
 # remove tests
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/ctdb*_tests
 %{__rm} -r $RPM_BUILD_ROOT%{_libexecdir}/ctdb/tests
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/ctdb/tests
 
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_postclean
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -792,9 +811,6 @@ fi
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%post	-n python-samba -p /sbin/ldconfig
-%postun	-n python-samba -p /sbin/ldconfig
-
 %post	-n libsmbclient -p /sbin/ldconfig
 %postun	-n libsmbclient -p /sbin/ldconfig
 
@@ -839,6 +855,7 @@ fi
 %{systemdunitdir}/smb.service
 %{systemdunitdir}/samba.service
 %{systemdtmpfilesdir}/samba.conf
+%attr(755,root,root) %{_bindir}/dumpmscat
 %attr(755,root,root) %{_bindir}/oLschema2ldif
 %attr(755,root,root) %{_bindir}/pdbedit
 %attr(755,root,root) %{_bindir}/profiles
@@ -850,6 +867,7 @@ fi
 %attr(755,root,root) %{_sbindir}/nmbd
 %attr(755,root,root) %{_sbindir}/samba
 %attr(755,root,root) %{_sbindir}/samba_dnsupdate
+%attr(755,root,root) %{_sbindir}/samba_downgrade_db
 %attr(755,root,root) %{_sbindir}/samba-gpupdate
 %attr(755,root,root) %{_sbindir}/samba_kcc
 %attr(755,root,root) %{_sbindir}/samba_spnupdate
@@ -860,6 +878,9 @@ fi
 %attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_9.so
 %attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_10.so
 %attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_11.so
+%attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_12.so
+%attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_14.so
+%attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_16.so
 %dir %{_libdir}/samba/gensec
 %attr(755,root,root) %{_libdir}/samba/gensec/krb5.so
 %if %{with system_heimdal}
@@ -871,6 +892,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/ldb/acl.so
 %attr(755,root,root) %{_libdir}/samba/ldb/anr.so
 %attr(755,root,root) %{_libdir}/samba/ldb/audit_log.so
+%attr(755,root,root) %{_libdir}/samba/ldb/count_attrs.so
 %attr(755,root,root) %{_libdir}/samba/ldb/descriptor.so
 %attr(755,root,root) %{_libdir}/samba/ldb/dirsync.so
 %attr(755,root,root) %{_libdir}/samba/ldb/dns_notify.so
@@ -885,12 +907,13 @@ fi
 %attr(755,root,root) %{_libdir}/samba/ldb/lazy_commit.so
 %attr(755,root,root) %{_libdir}/samba/ldb/ldbsamba_extensions.so
 %attr(755,root,root) %{_libdir}/samba/ldb/linked_attributes.so
-%attr(755,root,root) %{_libdir}/samba/ldb/local_password.so
+#%attr(755,root,root) %{_libdir}/samba/ldb/local_password.so
 %attr(755,root,root) %{_libdir}/samba/ldb/new_partition.so
 %attr(755,root,root) %{_libdir}/samba/ldb/objectclass_attrs.so
 %attr(755,root,root) %{_libdir}/samba/ldb/objectclass.so
 %attr(755,root,root) %{_libdir}/samba/ldb/objectguid.so
 %attr(755,root,root) %{_libdir}/samba/ldb/operational.so
+%attr(755,root,root) %{_libdir}/samba/ldb/paged_results.so
 %attr(755,root,root) %{_libdir}/samba/ldb/partition.so
 %attr(755,root,root) %{_libdir}/samba/ldb/password_hash.so
 %attr(755,root,root) %{_libdir}/samba/ldb/ranged_results.so
@@ -906,8 +929,6 @@ fi
 %attr(755,root,root) %{_libdir}/samba/ldb/schema_load.so
 %attr(755,root,root) %{_libdir}/samba/ldb/secrets_tdb_sync.so
 %attr(755,root,root) %{_libdir}/samba/ldb/show_deleted.so
-%attr(755,root,root) %{_libdir}/samba/ldb/simple_dn.so
-%attr(755,root,root) %{_libdir}/samba/ldb/simple_ldap_map.so
 %attr(755,root,root) %{_libdir}/samba/ldb/subtree_delete.so
 %attr(755,root,root) %{_libdir}/samba/ldb/subtree_rename.so
 %attr(755,root,root) %{_libdir}/samba/ldb/tombstone_reanimate.so
@@ -930,7 +951,6 @@ fi
 %attr(755,root,root) %{_libdir}/samba/service/nbtd.so
 %attr(755,root,root) %{_libdir}/samba/service/ntp_signd.so
 %attr(755,root,root) %{_libdir}/samba/service/s3fs.so
-%attr(755,root,root) %{_libdir}/samba/service/web.so
 %attr(755,root,root) %{_libdir}/samba/service/winbindd.so
 %attr(755,root,root) %{_libdir}/samba/service/wrepl.so
 %dir %{_libdir}/samba/vfs
@@ -942,6 +962,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/vfs/btrfs.so
 %attr(755,root,root) %{_libdir}/samba/vfs/cap.so
 %attr(755,root,root) %{_libdir}/samba/vfs/catia.so
+%{?with_ceph:%attr(755,root,root) %{_libdir}/samba/vfs/ceph_snapshots.so}
 %attr(755,root,root) %{_libdir}/samba/vfs/commit.so
 %attr(755,root,root) %{_libdir}/samba/vfs/crossrename.so
 %attr(755,root,root) %{_libdir}/samba/vfs/default_quota.so
@@ -953,9 +974,10 @@ fi
 %attr(755,root,root) %{_libdir}/samba/vfs/fileid.so
 %attr(755,root,root) %{_libdir}/samba/vfs/fruit.so
 %attr(755,root,root) %{_libdir}/samba/vfs/full_audit.so
+%attr(755,root,root) %{_libdir}/samba/vfs/gpfs.so
+%attr(755,root,root) %{_libdir}/samba/vfs/io_uring.so
 %attr(755,root,root) %{_libdir}/samba/vfs/linux_xfs_sgid.so
 %attr(755,root,root) %{_libdir}/samba/vfs/media_harmony.so
-%attr(755,root,root) %{_libdir}/samba/vfs/netatalk.so
 %attr(755,root,root) %{_libdir}/samba/vfs/offline.so
 %attr(755,root,root) %{_libdir}/samba/vfs/posix_eadb.so
 %attr(755,root,root) %{_libdir}/samba/vfs/preopen.so
@@ -972,8 +994,13 @@ fi
 %attr(755,root,root) %{_libdir}/samba/vfs/time_audit.so
 %attr(755,root,root) %{_libdir}/samba/vfs/unityed_media.so
 %attr(755,root,root) %{_libdir}/samba/vfs/virusfilter.so
+%attr(755,root,root) %{_libdir}/samba/vfs/widelinks.so
 %attr(755,root,root) %{_libdir}/samba/vfs/worm.so
 %attr(755,root,root) %{_libdir}/samba/vfs/xattr_tdb.so
+%dir %{_datadir}/samba/admx
+%{_datadir}/samba/admx/samba.admx
+%lang(en) %{_datadir}/samba/admx/en-US
+%{_datadir}/samba/mdssvc
 %{_datadir}/samba/setup
 %{_mandir}/man1/oLschema2ldif.1*
 %{_mandir}/man1/profiles.1*
@@ -984,6 +1011,7 @@ fi
 %{_mandir}/man8/nmbd.8*
 %{_mandir}/man8/pdbedit.8*
 %{_mandir}/man8/samba.8*
+%{_mandir}/man8/samba_downgrade_db.8*
 %{_mandir}/man8/samba-gpupdate.8*
 %{_mandir}/man8/smbd.8*
 %{_mandir}/man8/smbpasswd.8*
@@ -995,6 +1023,7 @@ fi
 %{_mandir}/man8/vfs_btrfs.8*
 %{_mandir}/man8/vfs_cap.8*
 %{_mandir}/man8/vfs_catia.8*
+%{?with_ceph:%{_mandir}/man8/vfs_ceph_snapshots.8*}
 %{_mandir}/man8/vfs_commit.8*
 %{_mandir}/man8/vfs_crossrename.8*
 %{_mandir}/man8/vfs_default_quota.8*
@@ -1004,10 +1033,10 @@ fi
 %{_mandir}/man8/vfs_fileid.8*
 %{_mandir}/man8/vfs_fruit.8*
 %{_mandir}/man8/vfs_full_audit.8*
+%{_mandir}/man8/vfs_gpfs.8*
+%{_mandir}/man8/vfs_io_uring.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_preopen.8*
 %{_mandir}/man8/vfs_readahead.8*
 %{_mandir}/man8/vfs_readonly.8*
@@ -1025,6 +1054,7 @@ fi
 %{_mandir}/man8/vfs_shell_snap.8*
 %{_mandir}/man8/vfs_unityed_media.8*
 %{_mandir}/man8/vfs_virusfilter.8*
+%{_mandir}/man8/vfs_widelinks.8*
 
 %dir %{_sambahome}
 %dir /var/lib/samba
@@ -1047,14 +1077,16 @@ fi
 
 %files vfs-glusterfs
 %defattr(644,root,root,755)
+%if %{with glusterfs}
 %attr(755,root,root) %{_libdir}/samba/vfs/glusterfs.so
-%attr(755,root,root) %{_libdir}/samba/vfs/glusterfs_fuse.so
 %{_mandir}/man8/vfs_glusterfs.8*
+%endif
+%attr(755,root,root) %{_libdir}/samba/vfs/glusterfs_fuse.so
 %{_mandir}/man8/vfs_glusterfs_fuse.8*
 
 %files common
 %defattr(644,root,root,755)
-%doc README WHATSNEW.txt
+%doc PFIF.txt README.cifs-utils README.md SECURITY.md WHATSNEW.txt
 %dir %{_sysconfdir}/samba
 %attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/smb.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/lmhosts
@@ -1066,16 +1098,13 @@ fi
 %attr(755,root,root) %{_bindir}/samba-tool
 %attr(755,root,root) %{_bindir}/smbpasswd
 %attr(755,root,root) %{_bindir}/testparm
-%attr(755,root,root) %{_bindir}/vfstest
 %dir %{_libdir}/samba/auth
-%attr(755,root,root) %{_libdir}/samba/auth/script.so
 %attr(755,root,root) %{_libdir}/samba/auth/samba4.so
 %dir %{_datadir}/samba
 %{_mandir}/man1/dbwrap_tool.1*
 %{_mandir}/man1/nmblookup.1*
 %{_mandir}/man1/reg*.1*
 %{_mandir}/man1/testparm.1*
-%{_mandir}/man1/vfstest.1*
 %{_mandir}/man5/lmhosts.5*
 %{_mandir}/man5/smb.conf.5*
 %{_mandir}/man5/smbpasswd.5*
@@ -1099,6 +1128,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cifsdd
 %attr(755,root,root) %{_bindir}/findsmb
+%attr(755,root,root) %{_bindir}/mdfind
 %attr(755,root,root) %{_bindir}/mvxattr
 %attr(755,root,root) %{_bindir}/rpcclient
 %attr(755,root,root) %{_bindir}/smbcacls
@@ -1106,7 +1136,11 @@ fi
 %attr(755,root,root) %{_bindir}/smbcquotas
 %attr(755,root,root) %{_bindir}/smbtar
 %attr(755,root,root) %{_bindir}/smbtree
+%if %{with winexe}
+%attr(755,root,root) %{_bindir}/winexe
+%endif
 %{_mandir}/man1/findsmb.1*
+%{_mandir}/man1/mdfind.1*
 %{_mandir}/man1/mvxattr.1*
 %{_mandir}/man1/rpcclient.1*
 %{_mandir}/man1/smbcacls.1*
@@ -1114,6 +1148,9 @@ fi
 %{_mandir}/man1/smbcquotas.1*
 %{_mandir}/man1/smbtar.1*
 %{_mandir}/man1/smbtree.1*
+%if %{with winexe}
+%attr(755,root,root) %{_mandir}/man1/winexe.1*
+%endif
 %{_mandir}/man8/cifsdd.8*
 
 %files winbind
@@ -1197,6 +1234,8 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libdcerpc-samr.so.0
 %attr(755,root,root) %{_libdir}/libdcerpc-server.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdcerpc-server.so.0
+%attr(755,root,root) %{_libdir}/libdcerpc-server-core.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcerpc-server-core.so.0
 %attr(755,root,root) %{_libdir}/libdcerpc.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdcerpc.so.0
 %attr(755,root,root) %{_libdir}/libndr-krb5pac.so.*.*.*
@@ -1204,7 +1243,7 @@ fi
 %attr(755,root,root) %{_libdir}/libndr-nbt.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libndr-nbt.so.0
 %attr(755,root,root) %{_libdir}/libndr.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libndr.so.0
+%attr(755,root,root) %ghost %{_libdir}/libndr.so.1
 %attr(755,root,root) %{_libdir}/libndr-standard.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libndr-standard.so.0
 %attr(755,root,root) %{_libdir}/libsamba-credentials.so.*.*.*
@@ -1214,8 +1253,8 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libsamba-hostconfig.so.0
 %attr(755,root,root) %{_libdir}/libsamba-passdb.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsamba-passdb.so.0
-%attr(755,root,root) %{_libdir}/libsamba-policy.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsamba-policy.so.0
+%attr(755,root,root) %{_libdir}/libsamba-policy.cpython-3*so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsamba-policy.cpython-3*.so.0
 %attr(755,root,root) %{_libdir}/libsamba-util.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsamba-util.so.0
 %attr(755,root,root) %{_libdir}/libsamdb.so.*.*.*
@@ -1265,6 +1304,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/libauth-unix-token-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libCHARSET3-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libcliauth-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libclidns-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libcli-cldap-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libcli-ldap-common-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libcli-ldap-samba4.so
@@ -1289,6 +1329,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/libgenrand-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libgensec-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libgpext-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libgpo-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libgse-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libHDB-SAMBA4-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libhttp-samba4.so
@@ -1304,26 +1345,27 @@ fi
 %attr(755,root,root) %{_libdir}/samba/libmessages-util-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libMESSAGING-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libMESSAGING-SEND-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libmscat-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libmsghdr-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libmsrpc3-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libndr-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libndr-samba-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libnetif-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libnet-keytab-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libnon-posix-acls-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libnpa-tstream-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libpac-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libpopt-samba3-cmdline-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libpopt-samba3-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libposix-eadb-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libprinter-driver-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libprinting-migrate-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libprocess-model-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libregistry-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsamba3-util-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsamba-debug-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsamba-modules-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libsamba-net-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libsamba-python-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libsamba-net.cpython-3*-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libsamba-python.cpython-3*-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsamba-security-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsamba-sockets-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsamdb-common-samba4.so
@@ -1335,13 +1377,13 @@ fi
 %attr(755,root,root) %{_libdir}/samba/libshares-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsmbclient-raw-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsmbd-base-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libsmbd-conn-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsmbd-shim-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsmbldaphelper-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsmbpasswdparser-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsmb-transport-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsocket-blocking-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libsys-rw-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libtalloc-report-printf-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libtalloc-report-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libtdb-wrap-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libtime-basic-samba4.so
@@ -1366,6 +1408,7 @@ fi
 %{_includedir}/samba-4.0/credentials.h
 %{_includedir}/samba-4.0/dcerpc.h
 %{_includedir}/samba-4.0/dcerpc_server.h
+%{_includedir}/samba-4.0/dcesrv_core.h
 %{_includedir}/samba-4.0/domain_credentials.h
 %dir %{_includedir}/samba-4.0/gen_ndr
 %{_includedir}/samba-4.0/gen_ndr/atsvc.h
@@ -1416,19 +1459,16 @@ fi
 %dir %{_includedir}/samba-4.0/util
 %{_includedir}/samba-4.0/util/attr.h
 %{_includedir}/samba-4.0/util/blocking.h
-%{_includedir}/samba-4.0/util/byteorder.h
 %{_includedir}/samba-4.0/util/data_blob.h
 %{_includedir}/samba-4.0/util/debug.h
+%{_includedir}/samba-4.0/util/discard.h
 %{_includedir}/samba-4.0/util/fault.h
 %{_includedir}/samba-4.0/util/genrand.h
 %{_includedir}/samba-4.0/util/idtree.h
 %{_includedir}/samba-4.0/util/idtree_random.h
-%{_includedir}/samba-4.0/util/memory.h
-%{_includedir}/samba-4.0/util/safe_string.h
 %{_includedir}/samba-4.0/util/signal.h
 %{_includedir}/samba-4.0/util/string_wrappers.h
 %{_includedir}/samba-4.0/util/substitute.h
-%{_includedir}/samba-4.0/util/talloc_stack.h
 %{_includedir}/samba-4.0/util/tevent_ntstatus.h
 %{_includedir}/samba-4.0/util/tevent_unix.h
 %{_includedir}/samba-4.0/util/tevent_werror.h
@@ -1445,6 +1485,7 @@ fi
 %attr(755,root,root) %{_libdir}/libdcerpc-binding.so
 %attr(755,root,root) %{_libdir}/libdcerpc-samr.so
 %attr(755,root,root) %{_libdir}/libdcerpc-server.so
+%attr(755,root,root) %{_libdir}/libdcerpc-server-core.so
 %attr(755,root,root) %{_libdir}/libdcerpc.so
 %attr(755,root,root) %{_libdir}/libndr-krb5pac.so
 %attr(755,root,root) %{_libdir}/libndr-nbt.so
@@ -1455,7 +1496,7 @@ fi
 %attr(755,root,root) %{_libdir}/libsamba-errors.so
 %attr(755,root,root) %{_libdir}/libsamba-hostconfig.so
 %attr(755,root,root) %{_libdir}/libsamba-passdb.so
-%attr(755,root,root) %{_libdir}/libsamba-policy.so
+%attr(755,root,root) %{_libdir}/libsamba-policy.cpython-3*.so
 %attr(755,root,root) %{_libdir}/libsamba-util.so
 %attr(755,root,root) %{_libdir}/libsamdb.so
 %attr(755,root,root) %{_libdir}/libsmbconf.so
@@ -1471,7 +1512,7 @@ fi
 %{_pkgconfigdir}/netapi.pc
 %{_pkgconfigdir}/samba-credentials.pc
 %{_pkgconfigdir}/samba-hostconfig.pc
-%{_pkgconfigdir}/samba-policy.pc
+%{_pkgconfigdir}/samba-policy.cpython-3*.pc
 %{_pkgconfigdir}/samba-util.pc
 %{_pkgconfigdir}/samdb.pc
 
@@ -1482,51 +1523,70 @@ fi
 %{_mandir}/man3/Parse::Pidl*.3*
 %{perl_vendorlib}/Parse/Pidl*
 
-%files -n python-samba
+%files -n python3-samba
 %defattr(644,root,root,755)
-%dir %{py_sitedir}/samba
-%attr(755,root,root) %{py_sitedir}/samba/*.so
-%{py_sitedir}/samba/*.py[co]
-%dir %{py_sitedir}/samba/dcerpc
-%{py_sitedir}/samba/dcerpc/*.py[co]
-%attr(755,root,root) %{py_sitedir}/samba/dcerpc/*.so
-%dir %{py_sitedir}/samba/emulate
-%{py_sitedir}/samba/emulate/*.py[co]
-%dir %{py_sitedir}/samba/kcc
-%{py_sitedir}/samba/kcc/*.py[co]
-%dir %{py_sitedir}/samba/netcmd
-%{py_sitedir}/samba/netcmd/*.py[co]
-%dir %{py_sitedir}/samba/provision
-%{py_sitedir}/samba/provision/*.py[co]
-%dir %{py_sitedir}/samba/samba3
-%attr(755,root,root) %{py_sitedir}/samba/samba3/*.so
-%{py_sitedir}/samba/samba3/*.py[co]
-%dir %{py_sitedir}/samba/subunit
-%{py_sitedir}/samba/subunit/*.py[co]
-%dir %{py_sitedir}/samba/tests
-%{py_sitedir}/samba/tests/*.py[co]
-%dir %{py_sitedir}/samba/tests/blackbox
-%{py_sitedir}/samba/tests/blackbox/*.py[co]
-%dir %{py_sitedir}/samba/tests/dcerpc
-%{py_sitedir}/samba/tests/dcerpc/*.py[co]
-%dir %{py_sitedir}/samba/tests/dns_forwarder_helpers
-%{py_sitedir}/samba/tests/dns_forwarder_helpers/*.py[co]
-%dir %{py_sitedir}/samba/tests/kcc
-%{py_sitedir}/samba/tests/kcc/*.py[co]
-%dir %{py_sitedir}/samba/tests/samba_tool
-%{py_sitedir}/samba/tests/samba_tool/*.py[co]
-%dir %{py_sitedir}/samba/tests/emulate
-%{py_sitedir}/samba/tests/emulate/*.py[co]
-%dir %{py_sitedir}/samba/third_party
-%{py_sitedir}/samba/third_party/*.py[co]
-%dir %{py_sitedir}/samba/web_server
-%{py_sitedir}/samba/web_server/*.py[co]
+%dir %{py3_sitedir}/samba
+%{py3_sitedir}/samba/*.py
+%{py3_sitedir}/samba/__pycache__
+%attr(755,root,root) %{py3_sitedir}/samba/*.so
+%dir %{py3_sitedir}/samba/dcerpc
+%{py3_sitedir}/samba/dcerpc/*.py
+%{py3_sitedir}/samba/dcerpc/__pycache__
+%attr(755,root,root) %{py3_sitedir}/samba/dcerpc/*.so
+%dir %{py3_sitedir}/samba/emulate
+%{py3_sitedir}/samba/emulate/*.py
+%{py3_sitedir}/samba/emulate/__pycache__
+%dir %{py3_sitedir}/samba/gp_parse
+%{py3_sitedir}/samba/gp_parse/*.py
+%{py3_sitedir}/samba/gp_parse/__pycache__
+%dir %{py3_sitedir}/samba/kcc
+%{py3_sitedir}/samba/kcc/*.py
+%{py3_sitedir}/samba/kcc/__pycache__
+%dir %{py3_sitedir}/samba/netcmd
+%{py3_sitedir}/samba/netcmd/*.py
+%{py3_sitedir}/samba/netcmd/__pycache__
+%dir %{py3_sitedir}/samba/provision
+%{py3_sitedir}/samba/provision/*.py
+%{py3_sitedir}/samba/provision/__pycache__
+%dir %{py3_sitedir}/samba/samba3
+%{py3_sitedir}/samba/samba3/*.py
+%{py3_sitedir}/samba/samba3/__pycache__
+%attr(755,root,root) %{py3_sitedir}/samba/samba3/*.so
+%dir %{py3_sitedir}/samba/subunit
+%{py3_sitedir}/samba/subunit/*.py
+%{py3_sitedir}/samba/subunit/__pycache__
+%dir %{py3_sitedir}/samba/tests
+%{py3_sitedir}/samba/tests/*.py
+%{py3_sitedir}/samba/tests/__pycache__
+%dir %{py3_sitedir}/samba/tests/blackbox
+%{py3_sitedir}/samba/tests/blackbox/*.py
+%{py3_sitedir}/samba/tests/blackbox/__pycache__
+%dir %{py3_sitedir}/samba/tests/dcerpc
+%{py3_sitedir}/samba/tests/dcerpc/*.py
+%{py3_sitedir}/samba/tests/dcerpc/__pycache__
+%dir %{py3_sitedir}/samba/tests/dns_forwarder_helpers
+%{py3_sitedir}/samba/tests/dns_forwarder_helpers/*.py
+%{py3_sitedir}/samba/tests/dns_forwarder_helpers/__pycache__
+%dir %{py3_sitedir}/samba/tests/kcc
+%{py3_sitedir}/samba/tests/kcc/*.py
+%{py3_sitedir}/samba/tests/kcc/__pycache__
+%dir %{py3_sitedir}/samba/tests/krb5
+%{py3_sitedir}/samba/tests/krb5/*.py
+%{py3_sitedir}/samba/tests/krb5/__pycache__
+%dir %{py3_sitedir}/samba/tests/samba_tool
+%{py3_sitedir}/samba/tests/samba_tool/*.py
+%{py3_sitedir}/samba/tests/samba_tool/__pycache__
+%dir %{py3_sitedir}/samba/tests/emulate
+%{py3_sitedir}/samba/tests/emulate/*.py
+%{py3_sitedir}/samba/tests/emulate/__pycache__
+%dir %{py3_sitedir}/samba/third_party
+%{py3_sitedir}/samba/third_party/*.py
+%{py3_sitedir}/samba/third_party/__pycache__
 %if %{without system_libs}
-%attr(755,root,root) %{py_sitedir}/ldb.so
-%attr(755,root,root) %{py_sitedir}/talloc.so
-%attr(755,root,root) %{py_sitedir}/tdb.so
-%attr(755,root,root) %{py_sitedir}/_tevent.so
-%{py_sitedir}/tevent.py[co]
+%attr(755,root,root) %{py3_sitedir}/ldb.so
+%attr(755,root,root) %{py3_sitedir}/talloc.so
+%attr(755,root,root) %{py3_sitedir}/tdb.so
+%attr(755,root,root) %{py3_sitedir}/_tevent.so
 %endif
 
 %files test
@@ -1543,6 +1603,7 @@ fi
 %{_mandir}/man1/masktest.1*
 %{_mandir}/man1/ndrdump.1*
 %{_mandir}/man1/smbtorture.1*
+%{_mandir}/man1/vfstest.1*
 
 %files -n libsmbclient
 %defattr(644,root,root,755)
@@ -1615,6 +1676,7 @@ fi
 %{_datadir}/ctdb/events/legacy/31.clamd.script
 %{_datadir}/ctdb/events/legacy/40.vsftpd.script
 %{_datadir}/ctdb/events/legacy/41.httpd.script
+%{_datadir}/ctdb/events/legacy/48.netbios.script
 %{_datadir}/ctdb/events/legacy/49.winbind.script
 %{_datadir}/ctdb/events/legacy/50.samba.script
 %{_datadir}/ctdb/events/legacy/60.nfs.script
@@ -1624,6 +1686,7 @@ fi
 %attr(755,root,root) %{_sbindir}/ctdbd
 %attr(755,root,root) %{_sbindir}/ctdbd_wrapper
 %attr(755,root,root) %{_bindir}/ctdb
+%attr(755,root,root) %{_bindir}/ctdb_local_daemons
 %attr(755,root,root) %{_bindir}/ping_pong
 %attr(755,root,root) %{_bindir}/ltdbtool
 %attr(755,root,root) %{_bindir}/ctdb_diagnostics