- updated to 4.2.5

[packages/samba.git] / samba.spec

diff --git a/samba.spec b/samba.spec
index a614f1a979fd17f137008689523430be24969ab9..d3b024e53cfc70d3be2208a0c783a21e387d2479 100644 (file)
--- a/samba.spec
+++ b/samba.spec
@@ -4,30 +4,31 @@
 %bcond_without cups            # CUPS support
 %bcond_without ldap            # LDAP support
 %bcond_without avahi           # Avahi support
+%bcond_without systemd         # systemd integration
 %bcond_without system_libs     # system libraries (talloc,tdb,tevent,ldb,ntdb)
 
 %if %{with system_libs}
-%define                talloc_ver      2.0.7
-%define                tdb_ver         2:1.2.11
-%define                ldb_ver         1.1.16
-%define                tevent_ver      0.9.18
-%define                ntdb_ver        0.9
+%define                ldb_ver         1.1.20
+%define                ntdb_ver        1.0
+%define                talloc_ver      2:2.1.2
+%define                tdb_ver         2:1.3.6
+%define                tevent_ver      0.9.25
 %endif
 
 %include       /usr/lib/rpm/macros.perl
 
 # NOTE: packages order is: server + additions, common, clients, libs+devel, ldap
-%define                virusfilter_version 0.1.3
+%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.1.4
-Release:       3
+Version:       4.2.5
+Release:       1
 Epoch:         1
 License:       GPL v3
 Group:         Networking/Daemons
-Source0:       http://www.samba.org/samba/ftp/stable/samba-%{version}.tar.gz
-# Source0-md5: c7871012ac40b8c74afff42bbd873bd7
+Source0:       https://www.samba.org/ftp/samba/samba-%{version}.tar.gz
+# Source0-md5: 12b648d062f1fb96fb633f570bb2e496
 Source1:       smb.init
 Source2:       samba.pamd
 Source4:       samba.sysconfig
@@ -36,54 +37,65 @@ Source6:    smb.conf
 Source7:       winbind.init
 Source8:       winbind.sysconfig
 Source9:       samba.init
-Source10:      https://github.com/downloads/fumiyas/samba-virusfilter/samba-virusfilter-%{virusfilter_version}.tar.bz2
-# Source10-md5:        a3a30d5fbf309d356e8c5833db680c17
+Source10:      https://bitbucket.org/fumiyas/samba-virusfilter/downloads/samba-virusfilter-%{virusfilter_version}.tar.bz2
+# Source10-md5:        4bef017601d87f52f8c82819a3ff56ee
 Patch0:                system-heimdal.patch
-Patch1:                samba-c++-nofail.patch
-Patch2:                samba-lprng-no-dot-printers.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:                link.patch
+Patch5:                %{name}-heimdal.patch
 Patch6:                server-role.patch
-URL:           http://www.samba.org/
+Patch7:                %{name}-bug-9816.patch
+URL:           https://www.samba.org/
 BuildRequires: acl-devel
 %{?with_avahi:BuildRequires:   avahi-devel}
 BuildRequires: ceph-devel >= 0.73
 BuildRequires: ctdb-devel
 %{?with_cups:BuildRequires:    cups-devel >= 1:1.2.0}
+BuildRequires: cyrus-sasl-devel >= 2
+BuildRequires: dbus-devel
 BuildRequires: dmapi-devel
 BuildRequires: docbook-style-xsl
+# just FAM API
 BuildRequires: gamin-devel
 BuildRequires: gdbm-devel
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
 BuildRequires: glusterfs-devel
-BuildRequires: gnutls-devel
+BuildRequires: gnutls-devel >= 3.0.0
 BuildRequires: heimdal-devel >= 1.5.3-1
 BuildRequires: iconv
 BuildRequires: keyutils-devel
 BuildRequires: libaio-devel
+BuildRequires: libarchive-devel >= 3.1.2
+BuildRequires: libcap-devel
 BuildRequires: libcom_err-devel
 BuildRequires: libmagic-devel
 BuildRequires: libnscd-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}
 BuildRequires: pam-devel >= 0.99.8.1
 BuildRequires: perl-ExtUtils-MakeMaker
-BuildRequires: perl-Parse-Yapp
+BuildRequires: perl-Parse-Yapp >= 1.05
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
 %{?with_pgsql:BuildRequires:   postgresql-devel}
-BuildRequires: python-devel
+BuildRequires: python-devel >= 1:2.5.0
 BuildRequires: python-dns
-BuildRequires: python-modules
+BuildRequires: python-modules >= 1:2.5.0
 BuildRequires: python-testtools
 BuildRequires: readline-devel >= 4.2
 BuildRequires: rpm-perlprov
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.647
 BuildRequires: sed >= 4.0
+BuildRequires: socket_wrapper >= 1.1.2
+%{?with_systemd:BuildRequires: systemd-devel}
+BuildRequires: xfsprogs-devel
+BuildRequires: zlib-devel >= 1.2.3
 %if %{with system_libs}
 BuildRequires: ldb-devel >= %{ldb_ver}
 BuildRequires: ntdb-devel >= %{ntdb_ver}
@@ -95,11 +107,12 @@ BuildRequires:     talloc-devel >= %{talloc_ver}
 BuildRequires: tdb-devel >= %{tdb_ver}
 BuildRequires: tevent-devel >= %{tevent_ver}
 %endif
-BuildRequires: xfsprogs-devel
+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}
+# for samba_{dnsupdate,kcc,spnupdate,upgradedns} scripts
 Requires:      python-samba = %{epoch}:%{version}-%{release}
 Requires:      logrotate >= 3.7-4
 Requires:      pam >= 0.99.8.1
@@ -220,6 +233,7 @@ Summary:    Files used by both Samba servers and clients
 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
@@ -341,6 +355,7 @@ 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
 %if %{with system_libs}
 Requires:      ldb >= %{ldb_ver}
 Requires:      ntdb >= %{ntdb_ver}
@@ -384,8 +399,8 @@ 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 Module for Python
-Summary(pl.UTF-8):     Moduł Samba dla Pythona
+Summary:       Samba modules for Python
+Summary(pl.UTF-8):     Moduły Samby dla Pythona
 Group:         Development/Languages/Python
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
@@ -401,10 +416,10 @@ Requires: python-tevent >= %{tevent_ver}
 Obsoletes:     python-samba4
 
 %description -n python-samba
-Samba Module for Python.
+Samba modules for Python.
 
 %description -n python-samba -l pl.UTF-8
-Moduł Samba dla Pythona.
+Moduły Samby dla Pythona.
 
 %package test
 Summary:       Testing tools for Samba servers and clients
@@ -474,6 +489,9 @@ Group:              Networking/Daemons
 Requires(post,postun): sed >= 4.0
 Requires:      openldap-servers
 Obsoletes:     openldap-schema-samba3
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description -n openldap-schema-samba
 This package contains samba.schema for OpenLDAP.
@@ -490,9 +508,10 @@ Ten pakiet zawiera schemat Samby (samba.schema) dla OpenLDAP-a.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -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 '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
 
 %build
 LDFLAGS="${LDFLAGS:-%rpmldflags}" \
@@ -541,6 +560,7 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
        --with-regedit \
        --with-sendfile-support \
        --with-syslog \
+       %{!?with_systemd:--without-systemd} \
        --with-utmp \
        --with-winbind \
        --%{?with_avahi:en}%{!?with_avahi:dis}able-avahi \
@@ -775,9 +795,11 @@ fi
 %attr(755,root,root) %{_sbindir}/samba_spnupdate
 %attr(755,root,root) %{_sbindir}/samba_upgradedns
 %attr(755,root,root) %{_sbindir}/smbd
+%attr(755,root,root) %{_libdir}/samba/libdnsserver-common-samba4.so
 %dir %{_libdir}/samba/bind9
 %attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9.so
 %attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_9.so
+%attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_10.so
 %dir %{_libdir}/samba/hdb
 %attr(755,root,root) %{_libdir}/samba/hdb/hdb_samba4.so
 %dir %{_libdir}/samba/gensec
@@ -842,6 +864,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/service/smb.so
 %attr(755,root,root) %{_libdir}/samba/service/web.so
 %attr(755,root,root) %{_libdir}/samba/service/winbind.so
+%attr(755,root,root) %{_libdir}/samba/service/winbindd.so
 %attr(755,root,root) %{_libdir}/samba/service/wrepl.so
 %dir %{_libdir}/samba/vfs
 %attr(755,root,root) %{_libdir}/samba/vfs/acl_tdb.so
@@ -863,6 +886,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/vfs/extd_audit.so
 %attr(755,root,root) %{_libdir}/samba/vfs/fake_perms.so
 %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/linux_xfs_sgid.so
 %attr(755,root,root) %{_libdir}/samba/vfs/media_harmony.so
@@ -873,6 +897,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/vfs/readonly.so
 %attr(755,root,root) %{_libdir}/samba/vfs/recycle.so
 %attr(755,root,root) %{_libdir}/samba/vfs/scannedonly.so
+%attr(755,root,root) %{_libdir}/samba/vfs/snapper.so
 %attr(755,root,root) %{_libdir}/samba/vfs/shadow_copy2.so
 %attr(755,root,root) %{_libdir}/samba/vfs/shadow_copy.so
 %attr(755,root,root) %{_libdir}/samba/vfs/smb_traffic_analyzer.so
@@ -880,6 +905,7 @@ fi
 %attr(755,root,root) %{_libdir}/samba/vfs/streams_xattr.so
 %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/worm.so
 %attr(755,root,root) %{_libdir}/samba/vfs/xattr_tdb.so
 %{_datadir}/samba/setup
 %{_mandir}/man1/oLschema2ldif.1*
@@ -910,6 +936,7 @@ fi
 %{_mandir}/man8/vfs_extd_audit.8*
 %{_mandir}/man8/vfs_fake_perms.8*
 %{_mandir}/man8/vfs_fileid.8*
+%{_mandir}/man8/vfs_fruit.8*
 %{_mandir}/man8/vfs_full_audit.8*
 %{_mandir}/man8/vfs_linux_xfs_sgid.8*
 %{_mandir}/man8/vfs_media_harmony.8*
@@ -922,10 +949,12 @@ fi
 %{_mandir}/man8/vfs_shadow_copy2.8*
 %{_mandir}/man8/vfs_shadow_copy.8*
 %{_mandir}/man8/vfs_smb_traffic_analyzer.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_worm.8*
 %{_mandir}/man8/vfs_xattr_tdb.8*
 
 %dir %{_sambahome}
@@ -943,10 +972,12 @@ fi
 %files vfs-ceph
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/samba/vfs/ceph.so
+%{_mandir}/man8/vfs_ceph.8*
 
 %files vfs-glusterfs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/samba/vfs/glusterfs.so
+%{_mandir}/man8/vfs_glusterfs.8*
 
 %files vfs-notify_fam
 %defattr(644,root,root,755)
@@ -962,7 +993,6 @@ fi
 %attr(755,root,root) %{_bindir}/dbwrap_tool
 %attr(755,root,root) %{_bindir}/net
 %attr(755,root,root) %{_bindir}/nmblookup
-%attr(755,root,root) %{_bindir}/nmblookup4
 %attr(755,root,root) %{_bindir}/reg*
 %attr(755,root,root) %{_bindir}/samba-regedit
 %attr(755,root,root) %{_bindir}/samba-tool
@@ -979,7 +1009,6 @@ fi
 %{_datadir}/samba/codepages/valid.dat
 %{_mandir}/man1/dbwrap_tool.1*
 %{_mandir}/man1/nmblookup.1*
-%{_mandir}/man1/nmblookup4.1*
 %{_mandir}/man1/reg*.1*
 %{_mandir}/man1/testparm.1*
 %{_mandir}/man1/vfstest.1*
@@ -1017,7 +1046,6 @@ fi
 %attr(755,root,root) %{_bindir}/rpcclient
 %attr(755,root,root) %{_bindir}/smbcacls
 %attr(755,root,root) %{_bindir}/smbclient
-%attr(755,root,root) %{_bindir}/smbclient4
 %attr(755,root,root) %{_bindir}/smbcquotas
 %attr(755,root,root) %{_bindir}/smbtar
 %attr(755,root,root) %{_bindir}/smbtree
@@ -1040,9 +1068,8 @@ fi
 %attr(755,root,root) /%{_lib}/security/pam_winbind.so
 %attr(755,root,root) /%{_lib}/libnss_winbind.so*
 %attr(755,root,root) %{_libdir}/winbind_krb5_locator.so
-%attr(755,root,root) %{_libdir}/samba/libidmap.so
-%attr(755,root,root) %{_libdir}/samba/libnss_info.so
-%attr(755,root,root) %{_libdir}/samba/libiniparser.so
+%attr(755,root,root) %{_libdir}/samba/libidmap-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libnss-info-samba4.so
 %dir %{_libdir}/samba/idmap
 %attr(755,root,root) %{_libdir}/samba/idmap/ad.so
 %attr(755,root,root) %{_libdir}/samba/idmap/autorid.so
@@ -1128,6 +1155,8 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libsamba-credentials.so.0
 %attr(755,root,root) %{_libdir}/libsamba-hostconfig.so.*.*.*
 %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-util.so.*.*.*
@@ -1139,90 +1168,91 @@ fi
 %attr(755,root,root) %{_libdir}/libtevent-util.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libtevent-util.so.0
 %attr(755,root,root) %{_libdir}/libnetapi.so.0
-%attr(755,root,root) %{_libdir}/libpdb.so.0
 %attr(755,root,root) %{_libdir}/libsmbconf.so.0
 %attr(755,root,root) %{_libdir}/libsmbldap.so.0
-%attr(755,root,root) %{_libdir}/libsmbsharemodes.so.0
 %dir %{_libdir}/samba
-%attr(755,root,root) %{_libdir}/samba/libaddns.so
-%attr(755,root,root) %{_libdir}/samba/libads.so
-%attr(755,root,root) %{_libdir}/samba/libasn1util.so
-%attr(755,root,root) %{_libdir}/samba/libauth4.so
-%attr(755,root,root) %{_libdir}/samba/libauthkrb5.so
-%attr(755,root,root) %{_libdir}/samba/libauth_sam_reply.so
-%attr(755,root,root) %{_libdir}/samba/libauth.so
-%attr(755,root,root) %{_libdir}/samba/libauth_unix_token.so
-%attr(755,root,root) %{_libdir}/samba/libCHARSET3.so
-%attr(755,root,root) %{_libdir}/samba/libcliauth.so
-%attr(755,root,root) %{_libdir}/samba/libcli_cldap.so
-%attr(755,root,root) %{_libdir}/samba/libcli-ldap-common.so
-%attr(755,root,root) %{_libdir}/samba/libcli-ldap.so
-%attr(755,root,root) %{_libdir}/samba/libcli-nbt.so
-%attr(755,root,root) %{_libdir}/samba/libcli_smb_common.so
-%attr(755,root,root) %{_libdir}/samba/libcli_spoolss.so
-%attr(755,root,root) %{_libdir}/samba/libcluster.so
-%attr(755,root,root) %{_libdir}/samba/libcmdline-credentials.so
-%attr(755,root,root) %{_libdir}/samba/libdb-glue.so
-%attr(755,root,root) %{_libdir}/samba/libdbwrap.so
+%attr(755,root,root) %{_libdir}/samba/libaddns-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libads-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libasn1util-samba4.so
+%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-sam-reply-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libauth-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
+%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
+%attr(755,root,root) %{_libdir}/samba/libcli-nbt-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libcli-smb-common-samba4.so
+%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/libdb-glue-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libdbwrap-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libdcerpc-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libdcerpc-samba.so
-%attr(755,root,root) %{_libdir}/samba/libdfs_server_ad.so
-%attr(755,root,root) %{_libdir}/samba/libdsdb-module.so
-%attr(755,root,root) %{_libdir}/samba/liberrors.so
-%attr(755,root,root) %{_libdir}/samba/libevents.so
-%attr(755,root,root) %{_libdir}/samba/libflag_mapping.so
-%attr(755,root,root) %{_libdir}/samba/libgpo.so
-%attr(755,root,root) %{_libdir}/samba/libgse.so
-%attr(755,root,root) %{_libdir}/samba/libHDB_SAMBA4.so
-%attr(755,root,root) %{_libdir}/samba/libinterfaces.so
-%attr(755,root,root) %{_libdir}/samba/libkrb5samba.so
-%attr(755,root,root) %{_libdir}/samba/libldb-cmdline.so
-%attr(755,root,root) %{_libdir}/samba/libldbsamba.so
-%attr(755,root,root) %{_libdir}/samba/liblibcli_lsa3.so
-%attr(755,root,root) %{_libdir}/samba/liblibcli_netlogon3.so
-%attr(755,root,root) %{_libdir}/samba/liblibsmb.so
-%attr(755,root,root) %{_libdir}/samba/libLIBWBCLIENT_OLD.so
-%attr(755,root,root) %{_libdir}/samba/libMESSAGING.so
-%attr(755,root,root) %{_libdir}/samba/libmsrpc3.so
+%attr(755,root,root) %{_libdir}/samba/libdcerpc-samba-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libdfs-server-ad-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libdsdb-module-samba4.so
+%attr(755,root,root) %{_libdir}/samba/liberrors-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libevents-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libflag-mapping-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
+%attr(755,root,root) %{_libdir}/samba/libinterfaces-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libkrb5samba-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libldbsamba-samba4.so
+%attr(755,root,root) %{_libdir}/samba/liblibcli-lsa3-samba4.so
+%attr(755,root,root) %{_libdir}/samba/liblibcli-netlogon3-samba4.so
+%attr(755,root,root) %{_libdir}/samba/liblibsmb-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libLIBWBCLIENT-OLD-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libMESSAGING-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.so
-%attr(755,root,root) %{_libdir}/samba/libnetif.so
-%attr(755,root,root) %{_libdir}/samba/libnet_keytab.so
-%attr(755,root,root) %{_libdir}/samba/libnon_posix_acls.so
-%attr(755,root,root) %{_libdir}/samba/libnpa_tstream.so
-%attr(755,root,root) %{_libdir}/samba/libntvfs.so
-%attr(755,root,root) %{_libdir}/samba/libpac.so
-%attr(755,root,root) %{_libdir}/samba/libpopt_samba3.so
-%attr(755,root,root) %{_libdir}/samba/libposix_eadb.so
-%attr(755,root,root) %{_libdir}/samba/libprinting_migrate.so
-%attr(755,root,root) %{_libdir}/samba/libprocess_model.so
-%attr(755,root,root) %{_libdir}/samba/libsamba3-util.so
-%attr(755,root,root) %{_libdir}/samba/libsamba-modules.so
-%attr(755,root,root) %{_libdir}/samba/libsamba-net.so
-%attr(755,root,root) %{_libdir}/samba/libsamba_python.so
-%attr(755,root,root) %{_libdir}/samba/libsamba-security.so
-%attr(755,root,root) %{_libdir}/samba/libsamba-sockets.so
-%attr(755,root,root) %{_libdir}/samba/libsamdb-common.so
-%attr(755,root,root) %{_libdir}/samba/libsecrets3.so
-%attr(755,root,root) %{_libdir}/samba/libserver-role.so
-%attr(755,root,root) %{_libdir}/samba/libservice.so
-%attr(755,root,root) %{_libdir}/samba/libshares.so
-%attr(755,root,root) %{_libdir}/samba/libsmbd_base.so
-%attr(755,root,root) %{_libdir}/samba/libsmbd_conn.so
-%attr(755,root,root) %{_libdir}/samba/libsmbd_shim.so
-%attr(755,root,root) %{_libdir}/samba/libsmbldaphelper.so
-%attr(755,root,root) %{_libdir}/samba/libsmbpasswdparser.so
-%attr(755,root,root) %{_libdir}/samba/libsmbregistry.so
-%attr(755,root,root) %{_libdir}/samba/libsmb_transport.so
-%attr(755,root,root) %{_libdir}/samba/libtdb_compat.so
-%attr(755,root,root) %{_libdir}/samba/libtdb-wrap.so
-%attr(755,root,root) %{_libdir}/samba/libtrusts_util.so
-%attr(755,root,root) %{_libdir}/samba/libutil_cmdline.so
-%attr(755,root,root) %{_libdir}/samba/libutil_ntdb.so
-%attr(755,root,root) %{_libdir}/samba/libutil_reg.so
-%attr(755,root,root) %{_libdir}/samba/libutil_setid.so
-%attr(755,root,root) %{_libdir}/samba/libutil_tdb.so
-%attr(755,root,root) %{_libdir}/samba/libxattr_tdb.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/libntvfs-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libpac-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/libprinting-migrate-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libprocess-model-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libsamba3-util-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libsamba-cluster-support-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-security-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libsocket-blocking-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libsamba-sockets-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libsamdb-common-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libsecrets3-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libserver-role-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libservice-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libshares-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/libsmbregistry-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libsmb-transport-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libtdb-compat-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libtdb-wrap-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libtrusts-util-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libutil-cmdline-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libutil-ntdb-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libutil-reg-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libutil-setid-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libutil-tdb-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libxattr-tdb-samba4.so
 
 %files devel
 %defattr(644,root,root,755)
@@ -1230,6 +1260,7 @@ fi
 %dir %{_includedir}/samba-4.0/core
 %{_includedir}/samba-4.0/core/doserr.h
 %{_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/werror.h
 %{_includedir}/samba-4.0/credentials.h
@@ -1278,6 +1309,7 @@ fi
 %{_includedir}/samba-4.0/ldb_wrap.h
 %{_includedir}/samba-4.0/ndr.h
 %dir %{_includedir}/samba-4.0/ndr
+%{_includedir}/samba-4.0/ndr/ndr_dcerpc.h
 %{_includedir}/samba-4.0/ndr/ndr_drsblobs.h
 %{_includedir}/samba-4.0/ndr/ndr_drsuapi.h
 %{_includedir}/samba-4.0/ndr/ndr_nbt.h
@@ -1297,6 +1329,7 @@ fi
 %{_includedir}/samba-4.0/smb2_constants.h
 %{_includedir}/samba-4.0/smb2_create_blob.h
 %{_includedir}/samba-4.0/smb2_lease.h
+%{_includedir}/samba-4.0/smb2_lease_struct.h
 %{_includedir}/samba-4.0/smb2_signing.h
 %{_includedir}/samba-4.0/smb_cli.h
 %{_includedir}/samba-4.0/smb_cliraw.h
@@ -1315,14 +1348,21 @@ fi
 %{_includedir}/samba-4.0/tdr.h
 %{_includedir}/samba-4.0/tsocket.h
 %{_includedir}/samba-4.0/tsocket_internal.h
+%{_includedir}/samba-4.0/tstream_smbXcli_np.h
 %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/fault.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
@@ -1337,7 +1377,6 @@ fi
 %{_includedir}/samba-4.0/smbconf.h
 %{_includedir}/samba-4.0/smb_ldap.h
 %{_includedir}/samba-4.0/smbldap.h
-%{_includedir}/samba-4.0/smb_share_modes.h
 %attr(755,root,root) %{_libdir}/libdcerpc-atsvc.so
 %attr(755,root,root) %{_libdir}/libdcerpc-binding.so
 %attr(755,root,root) %{_libdir}/libdcerpc-samr.so
@@ -1349,14 +1388,13 @@ fi
 %attr(755,root,root) %{_libdir}/libndr.so
 %attr(755,root,root) %{_libdir}/libndr-standard.so
 %attr(755,root,root) %{_libdir}/libnetapi.so
-%attr(755,root,root) %{_libdir}/libpdb.so
 %attr(755,root,root) %{_libdir}/libregistry.so
 %attr(755,root,root) %{_libdir}/libsamba-credentials.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-util.so
 %attr(755,root,root) %{_libdir}/libsamdb.so
-%attr(755,root,root) %{_libdir}/libsmbsharemodes.so
 %attr(755,root,root) %{_libdir}/libsmbclient-raw.so
 %attr(755,root,root) %{_libdir}/libsmbconf.so
 %attr(755,root,root) %{_libdir}/libsmbldap.so
@@ -1377,7 +1415,6 @@ fi
 %{_pkgconfigdir}/samba-policy.pc
 %{_pkgconfigdir}/samba-util.pc
 %{_pkgconfigdir}/samdb.pc
-%{_pkgconfigdir}/smbsharemodes.pc
 %{_pkgconfigdir}/smbclient-raw.pc
 %if %{without system_libs}
 %{_mandir}/man3/ntdb.3*
@@ -1439,8 +1476,8 @@ fi
 %attr(755,root,root) %{_bindir}/smbtorture
 %attr(755,root,root) %{_libdir}/libtorture.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libtorture.so.0
-%attr(755,root,root) %{_libdir}/samba/libsubunit.so
-%attr(755,root,root) %{_libdir}/samba/libdlz_bind9_for_torture.so
+%attr(755,root,root) %{_libdir}/samba/libsubunit-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libdlz-bind9-for-torture-samba4.so
 %{_mandir}/man1/gentest.1*
 %{_mandir}/man1/locktest.1*
 %{_mandir}/man1/masktest.1*
@@ -1457,7 +1494,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsmbclient.so.*
 %attr(755,root,root) %{_libdir}/libwbclient.so.*
-%attr(755,root,root) %{_libdir}/samba/libwinbind-client.so
+%attr(755,root,root) %{_libdir}/samba/libwinbind-client-samba4.so
 %{_mandir}/man7/libsmbclient.7*
 
 %files -n libsmbclient-devel