X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=samba.spec;h=424f1adb2ddc27448559be2edd845d021e048365;hb=5021f7396781961d7201f4f433176c7deaf3a380;hp=9ff47424ee66dbe5bbfdbfea26f033e3e5f4a9b7;hpb=5a591c79436692d75f790279e9c5ee3dd2c6e752;p=packages%2Fsamba.git

diff --git a/samba.spec b/samba.spec
index 9ff4742..424f1ad 100644
--- a/samba.spec
+++ b/samba.spec
@@ -1,27 +1,27 @@
 #
 # Conditional build:
 %bcond_without	ads		# ActiveDirectory support
+%bcond_without	ceph		# Ceph (RADOS) storage support
 %bcond_without	cups		# CUPS support
 %bcond_without	ldap		# LDAP support
 %bcond_without	avahi		# Avahi support
 %bcond_without	dmapi		# DMAPI support
 %bcond_without	systemd		# systemd integration
-%bcond_with	system_heimdal	# Use system Heimdal libraries [was broken in samba 4.4.x + heimdal 1.5.x]
-%bcond_without	system_libs	# system libraries (talloc,tdb,tevent,ldb,ntdb)
+%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)
 %bcond_without	ctdb_pcp	# Performance Co-Pilot support for CTDB
 # turn on when https://bugzilla.samba.org/show_bug.cgi?id=11764 is fixed
 %bcond_with	replace
 
 %if %{with system_libs}
-%define		ldb_ver		1.1.27
-%define		ntdb_ver	1.0
-%define		talloc_ver	2:2.1.8
-%define		tdb_ver		2:1.3.10
-%define		tevent_ver	0.9.29
+%define		ldb_ver		1.3.3
+%define		talloc_ver	2:2.1.11
+%define		tdb_ver		2:1.3.15
+%define		tevent_ver	0.9.36
 %endif
 
-# dmapi-devel forces largefile/64bit stuff that isn't detected properly
-# -- what is the exact problem? samba 4.5.6 builds with DMAPI on i686
+# dmapi-devel with xfsprogs-devel >= 4.11(?) needs largefile (64bit off_t) that isn't detected properly
 %ifarch %{ix86}
 %undefine	with_dmapi
 %endif
@@ -33,13 +33,13 @@
 Summary:	Samba Active Directory and SMB server
 Summary(pl.UTF-8):	Serwer Samba Active Directory i SMB
 Name:		samba
-Version:	4.5.6
+Version:	4.8.2
 Release:	1
 Epoch:		1
 License:	GPL v3
 Group:		Networking/Daemons
 Source0:	https://www.samba.org/ftp/samba/samba-%{version}.tar.gz
-# Source0-md5:	7ee18b7f5266e469df43756685009ce3
+# Source0-md5:	417c065455f8948d1de2be4edd074390
 Source1:	smb.init
 Source2:	samba.pamd
 Source4:	samba.sysconfig
@@ -53,20 +53,22 @@ 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
-Patch3:		systemd-pid-dir.patch
+
 Patch4:		unicodePwd-nthash-values-over-LDAP.patch
 Patch5:		%{name}-heimdal.patch
 Patch6:		server-role.patch
 Patch7:		%{name}-bug-9816.patch
+Patch8:		%{name}-no_libbsd.patch
 URL:		https://www.samba.org/
 BuildRequires:	acl-devel
 %{?with_avahi:BuildRequires:	avahi-devel}
-BuildRequires:	ceph-devel >= 0.73
+%{?with_ceph:BuildRequires:	ceph-devel >= 0.73}
+BuildRequires:	cmocka-devel >= 1.0.0
 %{?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
+BuildRequires:	docbook-style-xsl-nons
 # just FAM API
 BuildRequires:	gamin-devel
 BuildRequires:	gdbm-devel
@@ -78,6 +80,7 @@ BuildRequires:	iconv
 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:	libmagic-devel
@@ -96,6 +99,7 @@ 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
@@ -111,9 +115,8 @@ BuildRequires:	xfsprogs-devel
 BuildRequires:	zlib-devel >= 1.2.3
 %if %{with system_libs}
 BuildRequires:	ldb-devel >= %{ldb_ver}
-BuildRequires:	ntdb-devel >= %{ntdb_ver}
+BuildRequires:	ldb-devel < 1.4
 BuildRequires:	python-ldb-devel >= %{ldb_ver}
-BuildRequires:	python-ntdb >= %{ntdb_ver}
 BuildRequires:	python-talloc-devel >= %{talloc_ver}
 BuildRequires:	python-tevent >= %{tevent_ver}
 BuildRequires:	talloc-devel >= %{talloc_ver}
@@ -121,7 +124,6 @@ BuildRequires:	tdb-devel >= %{tdb_ver}
 BuildRequires:	tevent-devel >= %{tevent_ver}
 %endif
 BuildRequires:	uid_wrapper >= 1.1.0
-BuildConflicts:	libbsd-devel
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
@@ -277,6 +279,8 @@ Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	systemd-units >= 38
 Obsoletes:	samba3-winbind
 Obsoletes:	samba4-winbind
+# pam_winbind is not complete replacement, but pam_smbpass has been removed (in samba 4.4)
+#Obsoletes:	pam-pam_smbpass
 
 %description winbind
 Provides the winbind daemon and testing tools to allow authentication
@@ -338,7 +342,6 @@ Group:		Libraries
 Requires:	gnutls >= 3.0.0
 %if %{with system_libs}
 Requires:	ldb >= %{ldb_ver}
-Requires:	ntdb >= %{ntdb_ver}
 Requires:	talloc >= %{talloc_ver}
 Requires:	tdb >= %{tdb_ver}
 Requires:	tevent >= %{tevent_ver}
@@ -387,10 +390,10 @@ Requires:	%{name}-common = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	python
 Requires:	python-dns
+Requires:	python-iso8601
 Requires:	python-modules
 %if %{with system_libs}
 Requires:	python-ldb >= %{ldb_ver}
-Requires:	python-ntdb >= %{ntdb_ver}
 Requires:	python-talloc >= %{talloc_ver}
 Requires:	python-tevent >= %{tevent_ver}
 %endif
@@ -473,7 +476,7 @@ Summary(pl.UTF-8):	Klastrowa baza danych oparta na bazie danych Trivial Database
 Group:		Daemons
 URL:		http://ctdb.samba.org/
 Requires(post,preun,postun):	systemd-units
-Requires(post):	/usr/bin/systemd-tmpfiles
+Requires(post):	/bin/systemd-tmpfiles
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	coreutils
 Requires:	fileutils
@@ -527,11 +530,12 @@ wyeksportowania do PMCD.
 %{?with_system_heimdal:%patch0 -p1}
 %patch1 -p1
 %patch2 -p1
-%patch3 -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
@@ -572,7 +576,7 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
 	--disable-rpath \
 	--disable-rpath-install \
 	--builtin-libraries=%{?with_replace:replace,}ccan,samba-cluster-support \
-	--bundled-libraries=NONE,iniparser,%{!?with_system_libs:talloc,tdb,ldb,ntdb,tevent,pytalloc,pytalloc-util,pytdb,pytevent,pyldb,pyldb-util},%{!?with_system_heimdal:roken,wind,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,kdc,com_err,compile_et,asn1_compile} \
+	--bundled-libraries=NONE,iniparser,%{!?with_system_libs:talloc,tdb,ldb,tevent,pytalloc,pytalloc-util,pytdb,pytevent,pyldb,pyldb-util},%{!?with_system_heimdal:roken,wind,hx509,asn1,heimbase,hcrypto,krb5,gssapi,heimntlm,hdb,kdc,com_err,compile_et,asn1_compile} \
 	--with-shared-modules=idmap_ad,idmap_adex,idmap_hash,idmap_ldap,idmap_rid,idmap_tdb2,auth_samba4,vfs_dfs_samba4 \
 	--with-cluster-support \
 	--with-acl-support \
@@ -588,7 +592,13 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
 	--with-regedit \
 	--with-sendfile-support \
 	--with-syslog \
-	%{!?with_systemd:--without-systemd} \
+%if %{with systemd}
+	--with-systemd \
+	--systemd-install-services \
+	--with-systemddir=%{systemdunitdir} \
+%else
+	--without-systemd \
+%endif
 	--with-utmp \
 	--with-winbind \
 	--%{?with_avahi:en}%{!?with_avahi:dis}able-avahi \
@@ -602,6 +612,7 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
 cd pidl
 %{__perl} Makefile.PL \
 	INSTALLDIRS=vendor
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -633,10 +644,6 @@ install -p source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_sbindir}
 
 cp -p packaging/systemd/samba.conf.tmp $RPM_BUILD_ROOT%{systemdtmpfilesdir}/samba.conf
 echo "d /var/run/ctdb 755 root root" > $RPM_BUILD_ROOT%{systemdtmpfilesdir}/ctdb.conf
-cp -p packaging/systemd/nmb.service $RPM_BUILD_ROOT%{systemdunitdir}
-cp -p packaging/systemd/samba.service $RPM_BUILD_ROOT%{systemdunitdir}
-cp -p packaging/systemd/smb.service $RPM_BUILD_ROOT%{systemdunitdir}
-cp -p packaging/systemd/winbind.service $RPM_BUILD_ROOT%{systemdunitdir}
 cp -p ctdb/config/ctdb.service $RPM_BUILD_ROOT%{systemdunitdir}
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
@@ -678,6 +685,7 @@ 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*
@@ -685,7 +693,7 @@ cp -p examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir}
 
 # remove tests
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/ctdb*_tests
-%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/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}
@@ -799,7 +807,7 @@ fi
 %service -q ldap restart
 
 %post -n ctdb
-/usr/bin/systemd-tmpfiles --create %{systemdtmpfilesdir}/ctdb.conf
+/bin/systemd-tmpfiles --create %{systemdtmpfilesdir}/ctdb.conf
 %systemd_post ctdb.service
 
 %preun -n ctdb
@@ -834,6 +842,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_gpoupdate
 %attr(755,root,root) %{_sbindir}/samba_kcc
 %attr(755,root,root) %{_sbindir}/samba_spnupdate
 %attr(755,root,root) %{_sbindir}/samba_upgradedns
@@ -857,6 +866,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/ldb/dirsync.so
 %attr(755,root,root) %{_libdir}/samba/ldb/dns_notify.so
 %attr(755,root,root) %{_libdir}/samba/ldb/dsdb_notification.so
+%attr(755,root,root) %{_libdir}/samba/ldb/encrypted_secrets.so
 %attr(755,root,root) %{_libdir}/samba/ldb/extended_dn_in.so
 %attr(755,root,root) %{_libdir}/samba/ldb/extended_dn_out.so
 %attr(755,root,root) %{_libdir}/samba/ldb/extended_dn_store.so
@@ -891,10 +901,12 @@ fi
 %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
+%attr(755,root,root) %{_libdir}/samba/ldb/unique_object_sids.so
 %attr(755,root,root) %{_libdir}/samba/ldb/update_keytab.so
 %attr(755,root,root) %{_libdir}/samba/ldb/vlv.so
 %attr(755,root,root) %{_libdir}/samba/ldb/wins_ldb.so
 %dir %{_libdir}/samba/process_model
+%attr(755,root,root) %{_libdir}/samba/process_model/prefork.so
 %attr(755,root,root) %{_libdir}/samba/process_model/standard.so
 %dir %{_libdir}/samba/service
 %attr(755,root,root) %{_libdir}/samba/service/cldap.so
@@ -915,7 +927,6 @@ fi
 %attr(755,root,root) %{_libdir}/samba/vfs/acl_tdb.so
 %attr(755,root,root) %{_libdir}/samba/vfs/acl_xattr.so
 %attr(755,root,root) %{_libdir}/samba/vfs/aio_fork.so
-%attr(755,root,root) %{_libdir}/samba/vfs/aio_linux.so
 %attr(755,root,root) %{_libdir}/samba/vfs/aio_pthread.so
 %attr(755,root,root) %{_libdir}/samba/vfs/audit.so
 %attr(755,root,root) %{_libdir}/samba/vfs/btrfs.so
@@ -950,6 +961,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/vfs/syncops.so
 %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/worm.so
 %attr(755,root,root) %{_libdir}/samba/vfs/xattr_tdb.so
 %{_datadir}/samba/setup
@@ -962,12 +974,12 @@ fi
 %{_mandir}/man8/nmbd.8*
 %{_mandir}/man8/pdbedit.8*
 %{_mandir}/man8/samba.8*
+%{_mandir}/man8/samba_gpoupdate.8*
 %{_mandir}/man8/smbd.8*
 %{_mandir}/man8/smbpasswd.8*
 %{_mandir}/man8/vfs_acl_tdb.8*
 %{_mandir}/man8/vfs_acl_xattr.8*
 %{_mandir}/man8/vfs_aio_fork.8*
-%{_mandir}/man8/vfs_aio_linux.8*
 %{_mandir}/man8/vfs_aio_pthread.8*
 %{_mandir}/man8/vfs_audit.8*
 %{_mandir}/man8/vfs_btrfs.8*
@@ -985,6 +997,7 @@ fi
 %{_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*
@@ -1001,6 +1014,7 @@ fi
 %{_mandir}/man8/vfs_offline.8*
 %{_mandir}/man8/vfs_shell_snap.8*
 %{_mandir}/man8/vfs_unityed_media.8*
+%{_mandir}/man8/vfs_virusfilter.8*
 
 %dir %{_sambahome}
 %dir /var/lib/samba
@@ -1014,10 +1028,12 @@ fi
 %attr(750,root,root) %dir /var/log/archive/samba
 %attr(1777,root,root) %dir /var/spool/samba
 
+%if %{with ceph}
 %files vfs-ceph
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/samba/vfs/ceph.so
 %{_mandir}/man8/vfs_ceph.8*
+%endif
 
 %files vfs-glusterfs
 %defattr(644,root,root,755)
@@ -1026,7 +1042,7 @@ fi
 
 %files common
 %defattr(644,root,root,755)
-%doc README WHATSNEW.txt Roadmap
+%doc README 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
@@ -1057,20 +1073,11 @@ fi
 %{_mandir}/man8/samba-tool.8*
 
 %if %{without system_libs}
-%attr(755,root,root) %{_bindir}/ntdbbackup
-%attr(755,root,root) %{_bindir}/ntdbdump
-%attr(755,root,root) %{_bindir}/ntdbrestore
-%attr(755,root,root) %{_bindir}/ntdbtool
 %attr(755,root,root) %{_bindir}/tdbbackup
 %attr(755,root,root) %{_bindir}/tdbdump
 %attr(755,root,root) %{_bindir}/tdbtool
-%attr(755,root,root) %{_libdir}/samba/libntdb.so.*
 %attr(755,root,root) %{_libdir}/samba/libtalloc.so.*
 %attr(755,root,root) %{_libdir}/samba/libtdb.so.*
-%{_mandir}/man8/ntdbbackup.8*
-%{_mandir}/man8/ntdbdump.8*
-%{_mandir}/man8/ntdbrestore.8*
-%{_mandir}/man8/ntdbtool.8*
 %{_mandir}/man8/tdbbackup.8*
 %{_mandir}/man8/tdbdump.8*
 %{_mandir}/man8/tdbtool.8*
@@ -1080,6 +1087,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cifsdd
 %attr(755,root,root) %{_bindir}/findsmb
+%attr(755,root,root) %{_bindir}/mvxattr
 %attr(755,root,root) %{_bindir}/rpcclient
 %attr(755,root,root) %{_bindir}/smbcacls
 %attr(755,root,root) %{_bindir}/smbclient
@@ -1087,6 +1095,7 @@ fi
 %attr(755,root,root) %{_bindir}/smbtar
 %attr(755,root,root) %{_bindir}/smbtree
 %{_mandir}/man1/findsmb.1*
+%{_mandir}/man1/mvxattr.1*
 %{_mandir}/man1/rpcclient.1*
 %{_mandir}/man1/smbcacls.1*
 %{_mandir}/man1/smbclient.1*
@@ -1143,7 +1152,10 @@ fi
 %files -n cups-backend-smb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{cups_serverbin}/backend/smb
-%attr(755,root,root) %{_libdir}/samba/smbspool_krb5_wrapper
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/samba
+%endif
+%attr(755,root,root) %{_libexecdir}/samba/smbspool_krb5_wrapper
 %attr(755,root,root) %{_bindir}/smbspool
 %{_mandir}/man8/smbspool.8*
 %{_mandir}/man8/smbspool_krb5_wrapper.8*
@@ -1199,7 +1211,7 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libtevent-util.so.0
 %attr(755,root,root) %{_libdir}/libnetapi.so.0
 %attr(755,root,root) %{_libdir}/libsmbconf.so.0
-%attr(755,root,root) %{_libdir}/libsmbldap.so.0
+%attr(755,root,root) %{_libdir}/libsmbldap.so.2
 %dir %{_libdir}/samba
 
 %if %{without replace}
@@ -1237,7 +1249,6 @@ fi
 %attr(755,root,root) %{_libdir}/samba/libauth4-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libauthkrb5-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libauth-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libauth-sam-reply-samba4.so
 %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
@@ -1249,6 +1260,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/libcli-spoolss-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libcluster-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libcmdline-credentials-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libcommon-auth-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libdb-glue-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libdbwrap-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libdcerpc-samba4.so
@@ -1261,7 +1273,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/libflag-mapping-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libgenrand-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libgensec-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libgpo-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libgpext-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
@@ -1276,6 +1288,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/libmessages-dgm-samba4.so
 %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/libmsghdr-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libmsrpc3-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libndr-samba4.so
@@ -1309,7 +1322,6 @@ fi
 %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/libsmbregistry-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
@@ -1331,7 +1343,9 @@ fi
 %{_includedir}/samba-4.0/core/error.h
 %{_includedir}/samba-4.0/core/hresult.h
 %{_includedir}/samba-4.0/core/ntstatus.h
+%{_includedir}/samba-4.0/core/ntstatus_gen.h
 %{_includedir}/samba-4.0/core/werror.h
+%{_includedir}/samba-4.0/core/werror_gen.h
 %{_includedir}/samba-4.0/credentials.h
 %{_includedir}/samba-4.0/dcerpc.h
 %{_includedir}/samba-4.0/dcerpc_server.h
@@ -1401,8 +1415,8 @@ fi
 %{_includedir}/samba-4.0/util/tevent_ntstatus.h
 %{_includedir}/samba-4.0/util/tevent_unix.h
 %{_includedir}/samba-4.0/util/tevent_werror.h
+%{_includedir}/samba-4.0/util/tfork.h
 %{_includedir}/samba-4.0/util/time.h
-%{_includedir}/samba-4.0/util/xfile.h
 %{_includedir}/samba-4.0/util_ldb.h
 %{_includedir}/samba-4.0/lookup_sid.h
 %{_includedir}/samba-4.0/machine_sid.h
@@ -1443,9 +1457,6 @@ fi
 %{_pkgconfigdir}/samba-policy.pc
 %{_pkgconfigdir}/samba-util.pc
 %{_pkgconfigdir}/samdb.pc
-%if %{without system_libs}
-%{_mandir}/man3/ntdb.3*
-%endif
 
 %files pidl
 %defattr(644,root,root,755)
@@ -1462,6 +1473,8 @@ fi
 %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
@@ -1485,15 +1498,14 @@ fi
 %{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/third_party/iso8601
-%{py_sitedir}/samba/third_party/iso8601/*.py[co]
 %dir %{py_sitedir}/samba/web_server
 %{py_sitedir}/samba/web_server/*.py[co]
 %if %{without system_libs}
 %attr(755,root,root) %{py_sitedir}/ldb.so
-%attr(755,root,root) %{py_sitedir}/ntdb.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
@@ -1599,15 +1611,17 @@ fi
 %attr(755,root,root) %{_bindir}/ltdbtool
 %attr(755,root,root) %{_bindir}/ctdb_diagnostics
 %attr(755,root,root) %{_bindir}/onnode
-%dir %{_libdir}/ctdb
-%{_libdir}/ctdb/ctdb_natgw
-%{_libdir}/ctdb/ctdb_recovery_helper
-%{_libdir}/ctdb/smnotify
-%attr(755,root,root) %{_libdir}/ctdb/ctdb_event_helper
-%attr(755,root,root) %{_libdir}/ctdb/ctdb_killtcp
-%attr(755,root,root) %{_libdir}/ctdb/ctdb_lock_helper
-%attr(755,root,root) %{_libdir}/ctdb/ctdb_lvs
-%attr(755,root,root) %{_libdir}/ctdb/ctdb_mutex_fcntl_helper
+%dir %{_libexecdir}/ctdb
+%{_libexecdir}/ctdb/ctdb_natgw
+%{_libexecdir}/ctdb/ctdb_recovery_helper
+%{_libexecdir}/ctdb/smnotify
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_event
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_eventd
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_killtcp
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_lock_helper
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_lvs
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_mutex_fcntl_helper
+%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_takeover_helper
 
 %{_mandir}/man1/ctdb.1*
 %{_mandir}/man1/ctdb_diagnostics.1*