- list individual python modules in without system_libs case to avoid file duplicates

[packages/samba.git] / samba4.spec

diff --git a/samba4.spec b/samba4.spec
index 99d8317843d716254cc687b53259df6d1d08082c..86aab9cce6d1f143160a4b939d1fee5343d30ca7 100644 (file)
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,89 +1,81 @@
+# TODO:
+#      - unbundle ntdb (no external release as of 16.Oct.2013)
 #
 # Conditional build:
-%bcond_without ads             # without ActiveDirectory support
-%bcond_without cups            # without CUPS support
-%bcond_without kerberos5       # without Kerberos V support
-%bcond_without ldap            # without LDAP support
-%bcond_without avahi
-%bcond_without system_libs
-
-# ADS requires kerberos5 and LDAP
-%if %{without kerberos5} || %{without ldap}
-%undefine      with_ads
-%endif
+%bcond_without ads             # ActiveDirectory support
+%bcond_without cups            # CUPS support
+%bcond_without ldap            # LDAP support
+%bcond_without avahi           # Avahi support
+%bcond_without system_libs     # system libraries (talloc,tdb,tevent,ldb)
 
 %if %{with system_libs}
 %define                talloc_ver      2.0.7
-%define                tdb_ver         2:1.2.10
-%define                ldb_ver         1.1.15
-%define                tevent_ver      0.9.17
+%define                tdb_ver         2:1.2.11
+%define                ldb_ver         1.1.16
+%define                tevent_ver      0.9.18
+%define                ntdb_ver        0.9
 %endif
 
+%include       /usr/lib/rpm/macros.perl
+
 %define                virusfilter_version 0.1.3
-Summary:       SMB server
-Summary(cs.UTF-8):     Server SMB
-Summary(da.UTF-8):     SMB server
-Summary(de.UTF-8):     SMB-Server
-Summary(es.UTF-8):     El servidor SMB
-Summary(fi.UTF-8):     SMB-palvelin
-Summary(fr.UTF-8):     Serveur SMB
-Summary(it.UTF-8):     Server SMB
-Summary(ja.UTF-8):     Samba SMB サーバー
-Summary(ko.UTF-8):     삼바 SMB 서버
-Summary(pl.UTF-8):     Serwer SMB
-Summary(pt_BR.UTF-8):  Cliente e servidor SMB
-Summary(ru.UTF-8):     SMB клиент и сервер
-Summary(tr.UTF-8):     SMB sunucusu
-Summary(uk.UTF-8):     SMB клієнт та сервер
-Summary(zh_CN.UTF-8):  Samba 客户端和服务器
+Summary:       Active Directory server
+Summary(pl.UTF-8):     Serwer Active Directory
 Name:          samba4
-Version:       4.0.3
-Release:       0.11
+Version:       4.1.3
+Release:       2
 Epoch:         1
 License:       GPL v3
 Group:         Networking/Daemons
 Source0:       http://www.samba.org/samba/ftp/stable/samba-%{version}.tar.gz
-# Source0-md5: fdb093fb362109dae0ccadc314318da7
+# Source0-md5: a5dbfe87f4cb3d9d91e15e5df99a59a1
 Source1:       smb.init
 Source2:       samba.pamd
-Source3:       swat.inetd
 Source4:       samba.sysconfig
 Source5:       samba.logrotate
 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
+Source11:      samba3.logrotate
 Patch0:                system-heimdal.patch
 Patch1:                samba-c++-nofail.patch
-Patch3:                samba-nscd.patch
 Patch4:                samba-lprng-no-dot-printers.patch
-Patch5:                samba-fam.patch
+Patch5:                systemd-pid-dir.patch
+Patch6:                unicodePwd-nthash-values-over-LDAP.patch
+Patch7:                link.patch
 URL:           http://www.samba.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
 BuildRequires: automake
 %{?with_avahi:BuildRequires:   avahi-devel}
+#BuildRequires:        ceph-devel
 BuildRequires: ctdb-devel
 %{?with_cups:BuildRequires:    cups-devel >= 1:1.2.0}
 BuildRequires: dmapi-devel
+BuildRequires: docbook-style-xsl
 BuildRequires: gamin-devel
 BuildRequires: gdbm-devel
 BuildRequires: gettext-devel
-%{?with_kerberos5:BuildRequires:       heimdal-devel >= 1.5.3-1}
+BuildRequires: glusterfs-devel
+BuildRequires: gnutls-devel
+BuildRequires: heimdal-devel >= 1.5.3-1
 BuildRequires: iconv
 BuildRequires: keyutils-devel
+BuildRequires: libaio-devel
 BuildRequires: libcom_err-devel
 BuildRequires: libmagic-devel
 BuildRequires: libnscd-devel
 BuildRequires: libtool >= 2:1.4d
 BuildRequires: make >= 3.81
 BuildRequires: ncurses-devel >= 5.2
+BuildRequires: ncurses-ext-devel >= 5.2
 %{?with_ldap:BuildRequires:    openldap-devel >= 2.3.0}
-BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pam-devel >= 0.99.8.1
-BuildRequires: perl(ExtUtils::MakeMaker)
-BuildRequires: perl(Parse::Yapp)
+BuildRequires: perl-ExtUtils-MakeMaker
+BuildRequires: perl-Parse-Yapp
 BuildRequires: pkgconfig
 BuildRequires: popt-devel
 %{?with_pgsql:BuildRequires:   postgresql-devel}
@@ -93,9 +85,12 @@ BuildRequires:       python-modules
 BuildRequires: python-testtools
 BuildRequires: readline-devel >= 4.2
 BuildRequires: rpmbuild(macros) >= 1.647
+BuildRequires: rpm-perlprov
+BuildRequires: rpm-pythonprov
 BuildRequires: sed >= 4.0
 %if %{with system_libs}
 BuildRequires: ldb-devel >= %{ldb_ver}
+#BuildRequires:        ntdb-devel >= %{ntdb_ver}
 BuildRequires: python-ldb-devel >= %{ldb_ver}
 BuildRequires: python-talloc-devel >= %{talloc_ver}
 BuildRequires: python-tevent >= %{tevent_ver}
@@ -107,6 +102,8 @@ BuildRequires:      xfsprogs-devel
 BuildConflicts:        libbsd-devel
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Requires:      %{name}-common-server = %{epoch}:%{version}-%{release}
+Requires:      python-samba4 = %{epoch}:%{version}-%{release}
 Requires:      logrotate >= 3.7-4
 Requires:      pam >= 0.99.8.1
 Requires:      rc-scripts >= 0.4.0.12
@@ -137,94 +134,7 @@ also provides some SMB clients, which complement the built-in SMB
 filesystem in Linux. Samba uses NetBIOS over TCP/IP (NetBT) protocols
 and does NOT need NetBEUI (Microsoft Raw NetBIOS frame) protocol.
 
-This release is known as the "Locking Update" and has full support for
-Opportunistic File Locking. In addition this update includes native
-support for Microsoft encrypted passwords, improved browse list and
-WINS database management.
-
-Please refer to the WHATSNEW.txt document for fixup information. This
-binary release includes encrypted password support. Please read the
-smb.conf file for implementation details.
-
-%description -l cs.UTF-8
-Samba poskytuje server SMB, který lze použít pro poskytování síťových
-služeb klientům SMB (někdy nazývaných klienti "LAN manažer") včetně
-klientů různých verzí MS Windows, OS/2 a dalších linuxových strojů.
-Samba též poskytuje některé klienty SMB, kteří komplementují vestavěný
-souborový systém SMB v Linuxu. Samba používá protokoly NetBIOS přes
-TCP/IP (NetBT) a NEpotřebuje protokol NetBEUI (neformátovaný rámec
-NetBIOS od společnosti Microsoft.
-
-%description -l da.UTF-8
-Samba tilbyder en SMB server som kan bruges til at tilbyde netværk
-services til SMB (også kaldet "Lan Manager") klienter, incl.
-forskellige versioner af MS Windows, OS/2, og andre Linux maskiner.
-Samba tilbyder også SMB klienter, som udbygger det indbyggede SMB
-filsystem i Linux. Samba benytter NetBIOS over TCP/IP (NetBT)
-protocolen og kræver ikke NetBEUI (Microsoft Raw NetBIOS frame)
-protokollen.
-
-%description -l de.UTF-8
-Samba stellt einen SMB-Server zum Anbieten von Netzwerkdiensten für
-SMB-Clients (auch "Lan Manager" genannt) zur Verfügung, darunter
-verschiedenen Versionen von MS Windows-, OS/2- und anderen
-Linux-Rechnern. Samba enthält außerdem einige SMB-Clients, die das in
-Linux integrierte SMB-Dateisystem ergänzen. Samba benutzt
-NetBIOS-über-TCP/IP (NetBT)-Protokolle und benötigt KEIN NetBEUI
-(Microsoft Raw NetBIOS frame)-Protokoll.
-
-%description -l es.UTF-8
-Samba provee un servidor SMB que se puede usar para ofrecer servicios
-de red a clientes SMB (algunas veces se le llama de "Lan Manager"),
-incluyendo varias versiones de MS Windows, OS/2, y otras máquinas
-Linux. Samba también ofrece algunos clientes SMB, que complementan el
-sistema de archivos SMB de Linux. Samba usa el protocolo NetBIOS sobre
-TCP/IP (NetBT) y no necesita del protocolo NetBEUI (Microsoft Raw
-NetBIOS frame).
-
-%description -l fi.UTF-8
-Samba on SMB-palvelin, jota voidaan käyttää SMB-asiakasohjelmien
-verkkopalvelujen tarjoajana. SMB-protokollaa kutsutaan joskus "Lan
-Manager" protokollaksi ja asiakasohjelmat toimivat dosissa,
-Windowseissa, OS/2:ssa ja toisissa Linux-koneissa. Samban mukana on
-myös joitakin SMB-asiakasohjelmia, jotka täydentävät Linuxin
-kernelissä olevaa SMB-tiedostojärjestelmän tukea. Samba vaatii NetBIOS
-over TCP/IP (NetBT) protokollaa eikä tarvitse tai pysty käyttämään
-NetBEUI-protokollaa.
-
-%description -l it.UTF-8
-Samba fornisce un server SMB che puo` essere usato per fornire servizi
-di rete ai client SMB, incluse le versioni MS Windows, OS/2 e per
-altre macchine Linux. Samba fornisce anche i client SMB. Samba usa
-NetBIOS sopra TCP/IP e non ha bisogno del protocollo NetBEUI.
-
-%description -l ja.UTF-8
-Samba は MS Windows の様々なバージョン、OS/2 そして他の Linux マシン
-を含む SMB (たまに "Lan Manager" と呼ばれる)
-クライアントにネットワーク サービスを提供するために使用される SMB
-サーバを提供します。Samba は NetBIOS over TCP/IP (NetBT)
-プロトコルを使用し、 NetBEUI(Microsoft Raw NetBIOS frame)
-プロトコルは必要ありません。
-
-Samba ほとんど動作する NT ドメインコントロールの機能を特徴とし、
-好きなブラウザを使って samba の smb.conf ファイルをリモート管理する
-新しい SWAT (Samba Web Administration Tool) を含みます。
-目下のところこれは inetd を通して TCP ポート 901 で有効になります。
-
-%description -l ko.UTF-8
-삼바는 MS Windows, OS/2, 혹은 다른 리눅스 머신을 포함하는 SMB(혹은
-"Lan Manager"라고도 불림) 클라이언트를 네트워크 서비스 위해 사용할 수
-있는 SMB 서버를 제공한다. 삼바는 TCP/IP 프로토콜을 통해 NetBIOS를
-사용하고 NetBEUI (Microsoft Raw NetBIOS 프레임) 프로토콜은 필요하지
-않다.
-
-삼바-2.2 의 특징은 NT 도메인 컨트롤의 성능으로 작업을 하고, 새로운
-SWAT(Samba Web Administration Tool)로 웹브라우저를 사용하여 원격지에서
-삼바의 smb.conf 파일을 관리하도록 한다. 이러한 경우 inetd 데몬을 통해
-TCP 901 포트를 사용하게 된다.
-
-최근 정보로 WHATSNEW.txt 파일의 문서를 참고하도록 한다. 바이너리의
-릴리즈는 암호화된 패스워드를 제공한다.
+This package contains main Active Directory server daemon.
 
 %description -l pl.UTF-8
 Samba udostępnia serwer SMB, który może być użyty w celu dostarczenia
@@ -235,100 +145,15 @@ NetBIOS po TCP/IP (NetBT) i nie wymaga protokołu NetBEUI. Ta wersja ma
 pełne wsparcie dla blokowania plików, a także wsparcie dla kodowania
 haseł w standardzie MS i zarządzania bazą WINS.
 
-%description -l pt_BR.UTF-8
-O Samba provê um servidor SMB que pode ser usado para oferecer
-serviços de rede a clientes SMB (algumas vezes chamado de "Lan
-Manager"), incluindo várias versões de MS Windows, OS/2, e outras
-máquinas Linux. O Samba também fornece alguns clientes SMB, que
-complementam o sistema de arquivos SMB do Linux. O Samba usa o
-protocolo NetBIOS sobre TCP/IP (NetBT) e não necessita do protocolo
-NetBEUI (Microsoft Raw NetBIOS frame).
-
-O Samba inclui a maioria das características de um servidor de
-Controle de Domínios NT e o SWAT (Samba Web Administration Tool), que
-permite que o arquivo smb.conf seja gerenciado remotamente através de
-um navegador. Atualmente isto está sendo habilitado na porta TCP 901
-via inetd.
-
-%description -l ru.UTF-8
-Samba предоставляет SMB-сервер, который может быть использован для
-предоставления сетевых сервисов SMB (иногда называемым "Lan Manager")
-клиентам, включая разнообразные версии MS Windows, OS/2, и другие
-Linux-машины. Samba также предоставляет SMB-клиентов, которые работают
-со встроенной в Linux файловой системой SMB.
-
-Samba использует протокол NetBIOS over TCP/IP (NetBT) и не нуждается в
-протоколе NetBEUI (Microsoft Raw NetBIOS frame).
-
-Samba содержит практически работающую реализацию NT Domain Control и
-включает новый SWAT (Samba Web Administration Tool), который позволяет
-удаленно управлять конфигурационным файлом smb.conf при помощи вашего
-любимого WEB-броузера. Пока что он разрешен через inetd на TCP-порту
-901.
-
-%description -l uk.UTF-8
-Samba надає SMB-сервер, що може бути використаний для надання
-мережевих сервісів SMB (що їх іноді називають "Lan Manager") клієнтам,
-включаючи різноманітні версії MS Windows, OS/2, та інші Linux-машини.
-Samba також надає SMB-клієнтів, що працюють з вбудованою в Linux
-файловою системою SMB.
-
-Samba використовує протокол NetBIOS over TCP/IP (NetBT) та не потребує
-протоколу NetBEUI (Microsoft Raw NetBIOS frame).
-
-Samba містить майже працюючу реализацію NT Domain Control та новый
-SWAT (Samba Web Administration Tool), котрий дозволяє віддалено
-керувати конфігураційним файлом smb.conf за допомогою вашого
-улюбленого WEB-броузера. Поки що він дозволений через inetd на
-TCP-порту 901.
-
-%package -n samba3-swat
-Summary:       Samba Web Administration Tool
-Summary(pl.UTF-8):     Narzędzie administracyjne serwisu Samba
-Summary(pt_BR.UTF-8):  Samba SWAT e documentação Web
-Summary(ru.UTF-8):     Программа конфигурации SMB-сервера Samba
-Summary(uk.UTF-8):     Програма конфигурації SMB-сервера Samba
-Group:         Networking/Admin
-Requires:      %{name}-samba3 = %{epoch}:%{version}-%{release}
-Requires:      inetdaemon
-Requires:      rc-inetd >= 0.8.2
-Obsoletes:     swat
-
-%description -n samba3-swat
-swat allows a Samba administrator to configure the complex smb.conf
-file via a Web browser. In addition, a swat configuration page has
-help links to all the configurable options in the smb.conf file
-allowing an administrator to easily look up the effects of any change.
-
-%description -n samba3-swat -l pl.UTF-8
-swat pozwala na kompleksową konfigurację smb.conf przy pomocy
-przeglądarki WWW.
-
-%description -n samba3-swat -l pt_BR.UTF-8
-SWAT - ferramentada Web de configuração do Samba.
-
-%description -n samba3-swat -l ru.UTF-8
-Пакет samba-swat включает новый SWAT (Samba Web Administration Tool),
-для удаленного администрирования файла smb.conf при помощи вашего
-любимого Web-браузера.
-
-%description -n samba3-swat -l uk.UTF-8
-Пакет samba-swat містить новий SWAT (Samba Web Administration Tool),
-для дистанційного адміністрування файлу smb.conf за допомогою вашого
-улюбленого Web-браузеру.
+Ten pakiet dostarcza główny demon Active Directory.
 
 %package client
-Summary:       Samba client programs
-Summary(es.UTF-8):     Cliente SMB de Samba
-Summary(ja.UTF-8):     Samba (SMB) クライアントプログラム
-Summary(pl.UTF-8):     Klienci serwera Samba
-Summary(pt_BR.UTF-8):  Cliente SMB do samba
-Summary(ru.UTF-8):     Клиентские программы Samba (SMB)
-Summary(uk.UTF-8):     Клієнтські програми Samba (SMB)
+Summary:       Samba AD client programs
+Summary(pl.UTF-8):     Klienci serwera Samba AD
 Group:         Applications/Networking
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
-%{?with_kerberos5:Requires:    heimdal-libs >= 1.5.3-1}
-Requires:      libsmbclient-raw = %{epoch}:%{version}-%{release}
+Requires:      python-samba4 = %{epoch}:%{version}-%{release}
+Requires:      heimdal-libs >= 1.5.3-1
 Suggests:      cifs-utils
 Obsoletes:     smbfs
 
@@ -337,67 +162,42 @@ Samba-client provides some SMB clients, which complement the build-in
 SMB filesystem in Linux. These allow accessing of SMB shares and
 printing to SMB printers.
 
-%description client -l es.UTF-8
-Cliente SMB de Samba.
-
-%description client -l ja.UTF-8
-Samba-client は Linux 上に含まれている SMB ファイルシステムを補う SMB
-クライアントを提供します。これらは SMB 共有のアクセスと SMB
-プリンタへの印刷を許可します。
-
 %description client -l pl.UTF-8
 Samba-client dostarcza programy uzupełniające obsługę systemu plików
 SMB zawartą w jądrze. Pozwalają one na współdzielenie zasobów SMB i
 drukowanie w sieci SMB.
 
-%description client -l pt_BR.UTF-8
-O pacote samba-clientes prove alguns clientes SMB, que complementam o
-sistema de arquivos SMB do Linux. Eles permitem o acesso a shares SMB,
-e também, à impressoras SMB.
-
-%description client -l ru.UTF-8
-Пакет samba-client предоставляет некоторые клиенты SMB для работы со
-встроенной файловой системой SMB в Linux. Эти клиенты позволяют
-получать доступ к разделяемым каталогам SMB и печать на SMB-принтеры.
-
-%description client -l uk.UTF-8
-Пакет samba-client надає деякі клієнти SMB для роботи зі вбудованою
-файловою системою SMB в Linux. Ці клієнти дозволяють отримувати доступ
-до каталогів спільного використання SMB та друк на SMB-прінтери.
-
 %package common
 Summary:       Files used by both Samba servers and clients
-Summary(ja.UTF-8):     Samba サーバーとクライアントで使用されるプログラム
 Summary(pl.UTF-8):     Pliki używane przez serwer i klientów Samby
-Summary(pt_BR.UTF-8):  Arquivos em comum entre samba e samba-clients
-Summary(ru.UTF-8):     Файлы, используемые как сервером, так и клиентом Samba
-Summary(uk.UTF-8):     Файли, що використовуються як сервером, так і клієнтом Samba
 Group:         Networking/Daemons
+Requires:      python-samba4 = %{epoch}:%{version}-%{release}
+%if %{with system_libs}
+Requires:      ldb >= %{ldb_ver}
+#Requires:     ntdb >= %{ntdb_ver}
 Requires:      talloc >= %{talloc_ver}
 Requires:      tdb >= %{tdb_ver}
+Requires:      tevent >= %{tevent_ver}
+%endif
 
 %description common
 Samba-common provides files necessary for both the server and client
 packages of Samba.
 
-%description common -l ja.UTF-8
-Samba-common は Samba のサーバとクライアントの両方のパッケージで
-使用されるファイルを提供します。
-
 %description common -l pl.UTF-8
 Samba-common dostarcza pliki niezbędne zarówno dla serwera jak i
 klientów Samby.
 
-%description common -l pt_BR.UTF-8
-Arquivos em comum entre os pacotes samba e samba-clients.
+%package common-server
+Summary:       Files used by both Samba3 PDC and Samba4 AD servers
+Summary(pl.UTF-8):     Pliki używane przez serwery Samba3 PDC i Samba4 AD
+Group:         Networking/Daemons
 
-%description common -l ru.UTF-8
-Samba-common содержит файлы, необходимые для работы как клиента, так и
-сервера Samba.
+%description common-server
+Files used by both Samba3 PDC and Samba4 AD servers.
 
-%description common -l uk.UTF-8
-Samba-common містить файли, необхідні для роботи як клієнта, так і
-сервера Samba.
+%description common-server -l pl.UTF-8
+Pliki używane przez serwery Samba3 PDC i Samba4 AD.
 
 %package winbind
 Summary:       Samba-winbind daemon, utilities and documentation
@@ -415,127 +215,189 @@ Pakiet zawiera demona winbind oraz narzędzia testowe. Umożliwia
 uwierzytelnianie i wyliczanie grup/użytkowników z kontrolera domeny
 Windows lub Samba.
 
-%package -n samba3-winbind
-Summary:       Samba-winbind daemon, utilities and documentation
-Summary(pl.UTF-8):     Demon samba-winbind, narzędzia i dokumentacja
-Group:         Networking/Daemons
-Requires(post,preun):  /sbin/chkconfig
-Requires:      %{name}-samba3-common = %{epoch}:%{version}-%{release}
-Requires:      systemd-units >= 38
-
-%description -n samba3-winbind
-Provides the winbind daemon and testing tools to allow authentication
-and group/user enumeration from a Windows or Samba domain controller.
-
-%description -n samba3-winbind -l pl.UTF-8
-Pakiet zawiera demona winbind oraz narzędzia testowe. Umożliwia
-uwierzytelnianie i wyliczanie grup/użytkowników z kontrolera domeny
-Windows lub Samba.
-
-%package -n nss_wins
-Summary:       Name Service Switch service for WINS
-Summary(pl.UTF-8):     Usługa Name Service Switch dla WINS
-Group:         Base
-Requires:      samba3-common = %{epoch}:%{version}-%{release}
+%package devel
+Summary:       Header files for Samba
+Summary(pl.UTF-8):     Pliki nagłówkowe Samby
+Group:         Development/Libraries
+Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 
-%description -n nss_wins
-Provides the libnss_wins shared library which resolves NetBIOS names
-to IP addresses.
+%description devel
+Header files for Samba.
 
-%description -n nss_wins -l pl.UTF-8
-Biblioteka dzielona libnss_wins rozwiązująca nazwy NetBIOS na adresy
-IP.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe Samby.
 
-%package -n pam-pam_smbpass
+%package -n pam-pam_smbpass3
 Summary:       PAM Samba Password Module
 Summary(pl.UTF-8):     Moduł PAM smbpass
 Group:         Base
 Obsoletes:     pam_smbpass
+Obsoletes:     pam-pam_smbpass < 1:4.0.8-3
 
-%description -n pam-pam_smbpass
+%description -n pam-pam_smbpass3
 PAM module which can be used on conforming systems to keep the
 smbpasswd (Samba password) database in sync with the Unix password
 file.
 
-%description -n pam-pam_smbpass -l pl.UTF-8
+%description -n pam-pam_smbpass3 -l pl.UTF-8
 Moduł PAM, który może być używany do trzymania pliku smbpasswd (hasła
 Samby) zsynchronizowanego z hasłami uniksowymi.
 
-%package -n libsmbclient-raw
-Summary:       libsmbclient-raw - samba client library
-Summary(pl.UTF-8):     libsmbclient-raw - biblioteka klienta samby
-Group:         Libraries
+%package pidl
+Summary:       Perl IDL compiler
+Summary(pl.UTF-8):     Kompilator IDL w Perlu
+Group:         Development/Tools
+#Requires:     perl-Parse-Yapp
 
-%description -n libsmbclient-raw
-libsmbclient-raw - library that allows to use samba clients functions.
+%description pidl
+The samba4-pidl package contains the Perl IDL compiler used by Samba
+and Wireshark to parse IDL and similar protocols.
 
-%description -n libsmbclient-raw -l pl.UTF-8
-libsmbclient-raw - biblioteka pozwalająca korzystać z funcji klienta
-samby.
+%description pidl -l pl.UTF-8
+Ten pakiet zawiera kompilator IDL napisany w Perlu, używany przez
+Sambę oraz Wiresharka to analizy IDL i podobnych protokołów.
 
-%package -n libsmbclient-raw-devel
-Summary:       libsmbclient-raw - samba client library
-Summary(pl.UTF-8):     libsmbclient-raw - biblioteka klienta samby
-Summary(pt_BR.UTF-8):  Ferramentas de desenvolvimento para clientes samba
-Group:         Development/Libraries
-Requires:      libsmbclient-raw = %{epoch}:%{version}-%{release}
+%package -n python-samba4
+Summary:       Samba Module for Python
+Summary(pl.UTF-8):     Moduł Samba dla Pythona
+Group:         Development/Languages/Python
+%pyrequires_eq python
+Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Requires:      python-dns
+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
+Obsoletes:     python-samba
+
+%description -n python-samba4
+Samba Module for Python.
 
-%description -n libsmbclient-raw-devel
-Header files for libsmbclient.
+%description -n python-samba4 -l pl.UTF-8
+Moduł Samba dla Pythona.
 
-%description -n libsmbclient-raw-devel -l pl.UTF-8
-Pliki nagłówkowe dla libsmbclient-raw.
+%package test
+Summary:       Testing tools for Samba servers and clients
+Summary(pl.UTF-8):     Narzędzia testowe dla serwerów i klientów Samby
+Group:         Applications/System
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Requires:      %{name}-winbind = %{epoch}:%{version}-%{release}
 
-%description -n libsmbclient-raw-devel -l pt_BR.UTF-8
-Arquivos de inclusão, bibliotecas e documentação necessários para
-desenvolver aplicativos clientes para o samba.
+%description test
+samba4-test provides testing tools for both the server and client
+packages of Samba.
 
-%package -n samba3-libsmbclient
-Summary:       libsmbclient - samba client library
-Summary(pl.UTF-8):     libsmbclient - biblioteka klienta samby
-Group:         Libraries
-Obsoletes:     libsmbclient < 1:4.0.0-1
+%description test -l pl.UTF-8
+Narzędzia testowe dla serwerów i klientów Samby.
 
-%description -n samba3-libsmbclient
-libsmbclient - library that allows to use samba clients functions.
+%package test-devel
+Summary:       Testing development files for Samba servers and clients
+Summary(pl.UTF-8):     Pliki programistyczne narzędzi testowych dla serwerów i klientów Samby
+Group:         Applications/System
+Requires:      %{name}-test = %{epoch}:%{version}-%{release}
 
-%description -n samba3-libsmbclient -l pl.UTF-8
-libsmbclient - biblioteka pozwalająca korzystać z funcji klienta
-samby.
+%description test-devel
+samba-test-devel provides development files for the library used by
+testing tools for both the server and client packages of Samba.
 
-%package -n samba3-libsmbclient-devel
-Summary:       libsmbclient - samba client library
-Summary(pl.UTF-8):     libsmbclient - biblioteka klienta samby
-Summary(pt_BR.UTF-8):  Ferramentas de desenvolvimento para clientes samba
-Group:         Development/Libraries
-Requires:      samba3-libsmbclient = %{epoch}:%{version}-%{release}
-Obsoletes:     libsmbclient-devel < 1:4.0.0-1
+%description test-devel -l pl.UTF-8
+Ten pakiet zawiera pliki programistyczne biblioteki wykorzystywanej
+przez narzędzia testowe dla serwerów i klientów Samby.
 
-%description -n samba3-libsmbclient-devel
-Header files for libsmbclient.
+%package -n samba3
+Summary:       SMB server
+Summary(pl.UTF-8):     Serwer SMB
+Group:         Networking/Daemons
+Requires:      samba3-common = %{epoch}:%{version}-%{release}
+Requires:      %{name}-common-server = %{epoch}:%{version}-%{release}
+# smbd links with libcups
+%{?with_cups:Requires: cups-lib >= 1:1.2.0}
+Obsoletes:     samba-pdb-xml
+Obsoletes:     samba-vfs-block
 
-%description -n samba3-libsmbclient-devel -l pl.UTF-8
-Pliki nagłówkowe dla libsmbclient.
+%description -n samba3
+Samba provides an SMB server which can be used to provide network
+services to SMB (sometimes called "Lan Manager") clients, including
+various versions of MS Windows, OS/2, and other Linux machines. Samba
+also provides some SMB clients, which complement the built-in SMB
+filesystem in Linux. Samba uses NetBIOS over TCP/IP (NetBT) protocols
+and does NOT need NetBEUI (Microsoft Raw NetBIOS frame) protocol.
 
-%description -n samba3-libsmbclient-devel -l pt_BR.UTF-8
-Arquivos de inclusão, bibliotecas e documentação necessários para
-desenvolver aplicativos clientes para o samba.
+%description -n samba3 -l pl.UTF-8
+Samba udostępnia serwer SMB, który może być użyty w celu dostarczenia
+usług sieciowych (potocznie zwanych "Lan Manager"), dla klientów
+takich jak MS Windows, OS/2 a także maszyn linuksowych. W pakiecie
+znajduje się również oprogramowanie klienckie. Samba używa protokołu
+NetBIOS po TCP/IP (NetBT) i nie wymaga protokołu NetBEUI. Ta wersja ma
+pełne wsparcie dla blokowania plików, a także wsparcie dla kodowania
+haseł w standardzie MS i zarządzania bazą WINS.
 
-%package devel
-Summary:       Header files for Samba
-Summary(pl.UTF-8):     Pliki nagłówkowe Samby
-Group:         Development/Libraries
+%package -n samba3-server
+Summary:       SMB server initscripts
+Summary(pl.UTF-8):     Skrypty startowe serwera SMB
+Group:         Networking/Daemons
+Requires(post,preun):  /sbin/chkconfig
+Requires:      samba3 = %{epoch}:%{version}-%{release}
+Requires:      logrotate >= 3.7-4
+Requires:      rc-scripts >= 0.4.0.12
+Requires:      setup >= 2.4.6-7
+Obsoletes:     samba < 1:4.0.0-1
 
-%description devel
-Header files for Samba.
+%description -n samba3-server
+This package contains startup scripts and services for old SMB server
+daemons (smbd, nmbd).
 
-%description devel -l pl.UTF-8
-Pliki nagłówkowe Samby.
+%description -n samba3-server -l pl.UTF-8
+Ten pakiet zawiera skrypty startowe dla starych usług serwera SMB
+(smbd, nmbd).
+
+%package -n samba3-client
+Summary:       Samba client programs
+Summary(pl.UTF-8):     Klienci serwera Samba
+Group:         Applications/Networking
+Requires:      samba3-common = %{epoch}:%{version}-%{release}
+Requires:      samba3-libsmbclient = %{epoch}:%{version}-%{release}
+Requires:      heimdal-libs
+Obsoletes:     smbfs
+Obsoletes:     samba-client < 1:4.0.0-1
+Suggests:      cifs-utils
+
+%description -n samba3-client
+Samba-client provides some SMB clients, which complement the build-in
+SMB filesystem in Linux. These allow accessing of SMB shares and
+printing to SMB printers.
+
+%description -n samba3-client -l pl.UTF-8
+Samba-client dostarcza programy uzupełniające obsługę systemu plików
+SMB zawartą w jądrze. Pozwalają one na współdzielenie zasobów SMB i
+drukowanie w sieci SMB.
+
+%package -n samba3-common
+Summary:       Files used by both Samba servers and clients
+Summary(pl.UTF-8):     Pliki używane przez serwer i klientów Samba
+Group:         Networking/Daemons
+Requires:      talloc >= %{libtalloc_ver}
+Requires:      tdb >= %{libtdb_ver}
+Obsoletes:     samba-common < 1:4.0.0-1
+
+%description -n samba3-common
+Samba-common provides files necessary for both the server and client
+packages of Samba.
+
+%description -n samba3-common -l pl.UTF-8
+Samba-common dostarcza pliki niezbędne zarówno dla serwera jak i
+klientów Samba.
 
 %package -n samba3-devel
 Summary:       Header files for Samba
 Summary(pl.UTF-8):     Pliki nagłówkowe Samby
 Group:         Development/Libraries
+Requires:      samba3-common = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-devel < 1:4.0.0-1
 
 %description -n samba3-devel
 Header files for Samba.
@@ -543,58 +405,34 @@ Header files for Samba.
 %description -n samba3-devel -l pl.UTF-8
 Pliki nagłówkowe Samby.
 
-%package -n samba3-smbget
-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
-
-%description -n samba3-smbget
-wget-like utility for download files over SMB.
-
-%description -n samba3-smbget -l pl.UTF-8
-Narzędzie podobne do wgeta do pobierania plików protokołem SMB
-używanym w sieciach MS Windows.
-
-%package -n cups-backend-samba3-smb
-Summary:       CUPS backend for printing to SMB printers
-Summary(pl.UTF-8):     Backend CUPS-a drukujący na drukarkach SMB
-Group:         Applications/Printing
-Requires:      samba3-client = %{epoch}:%{version}-%{release}
-Requires:      cups >= 1:1.2.0
-
-%description -n cups-backend-samba3-smb
-CUPS backend for printing to SMB printers.
-
-%description -n cups-backend-samba3-smb -l pl.UTF-8
-Backend CUPS-a drukujący na drukarkach SMB.
-
 %package -n samba3-vfs-audit
 Summary:       VFS module to audit file access
 Summary(pl.UTF-8):     Moduł VFS do monitorowania operacji na plikach
 Group:         Networking/Daemons
 Requires:      samba3 = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-vfs-audit < 1:4.0.0-1
 
 %description -n samba3-vfs-audit
-A simple module to audit file access to the syslog facility. The
-following operations are logged:
+A simple modules (audit, extd_audit, full_audit) to audit file access
+to the syslog facility. The following operations are logged:
  - share connect/disconnect,
  - directory opens/create/remove,
  - file open/close/rename/unlink/chmod.
 
 %description -n samba3-vfs-audit -l pl.UTF-8
-Proste moduły do monitorowania dostępu do plików na serwerze samba do
-do sysloga. Monitorowane są następujące operacje:
+Proste moduły (audit, extd_audit, full_audit) do monitorowania dostępu
+do plików na serwerze Samba do do sysloga. Monitorowane są następujące
+operacje:
  - podłączenie do/odłączenie od zasobu,
  - otwarcie/utworzenie/zmiana nazwy katalogu,
  - otwarcie/zamknięcie/zmiana nazwy/skasowanie/zmiana praw plików.
 
-Zawiera moduły audit, extd_audit i full_audit.
-
 %package -n samba3-vfs-cap
 Summary:       VFS module for CAP and samba compatibility
 Summary(pl.UTF-8):     Moduł VFS zgodności z CAP (Columbia AppleTalk Program)
 Group:         Networking/Daemons
 Requires:      samba3 = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-vfs-cap < 1:4.0.0-1
 
 %description -n samba3-vfs-cap
 Convert an incoming Shift-JIS character to the 3 byte hex
@@ -605,11 +443,31 @@ This is used for compatibility between Samba and CAP.
 Zamienia znaki kodowane Shift-JIS do trzybajowej szestnastkowej
 reprezentacji używanej przez program Columbia AppleTalk Program (CAP).
 
+%package -n samba3-vfs-catia
+Summary:       VFS module to fix Catia CAD filenames
+Summary(pl.UTF-8):     Moduł VFS poprawiający nazwy plików z pakietu CAD Catia
+Group:         Networking/Daemons
+Requires:      samba3 = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-vfs-catia < 1:4.0.0-1
+
+%description -n samba3-vfs-catia
+The Catia CAD package commonly creates filenames that use characters
+that are illegal in CIFS filenames. The vfs_catia VFS module
+implements a fixed character mapping so that these files can be shared
+with CIFS clients.
+
+%description -n samba3-vfs-catia -l pl.UTF-8
+Pakiet CAD Catia często tworzy nazwy plików, wykorzystujące znaki,
+które nie są dozwolone w nazwach plików CIFS. Moduł VFS vfs_catia
+implementuje stałe odwzorowanie znaków, pozwalające na współdzielenie
+plików z innymi klientami CIFS.
+
 %package -n samba3-vfs-default_quota
 Summary:       VFS module to store default quotas in a specified quota record
 Summary(pl.UTF-8):     Moduł VFS do zapisywania domyślnych limitów w określonym rekordzie
 Group:         Networking/Daemons
 Requires:      samba3 = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-vfs-default_quota < 1:4.0.0-1
 
 %description -n samba3-vfs-default_quota
 This VFS modules stores default quotas in a specified quota record.
@@ -623,6 +481,7 @@ Summary:    VFS module for hosting a Microsoft Distributed File System Tree
 Summary(pl.UTF-8):     Moduł VFS obsługi Microsoft Distributed File System
 Group:         Networking/Daemons
 Requires:      samba3 = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-vfs-expand_msdfs < 1:4.0.0-1
 
 %description -n samba3-vfs-expand_msdfs
 A VFS module for hosting a Microsoft Distributed File System Tree.
@@ -647,6 +506,7 @@ Summary:    VFS module to report read-only fires as writable
 Summary(pl.UTF-8):     Moduł VFS udający, że pliki tylko do odczytu są zapisywalne
 Group:         Networking/Daemons
 Requires:      samba3 = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-vfs-fake_perms < 1:4.0.0-1
 
 %description -n samba3-vfs-fake_perms
 This module allow Roaming Profile files and directories to be set (on
@@ -669,6 +529,7 @@ Summary:    VFS module to implement file change notifications
 Summary(pl.UTF-8):     Moduł VFS implementujący informowanie o zmianach w plikach
 Group:         Networking/Daemons
 Requires:      samba3 = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-vfs-notify_fam < 1:4.0.0-1
 
 %description -n samba3-vfs-notify_fam
 The vfs_notify_fam module makes use of the system FAM (File Alteration
@@ -680,36 +541,39 @@ Ten moduł używa demona FAM (File Alteration Monitor) do implementacji
 informowania o zmianach w plikach dla klientów Windows.
 
 %package -n samba3-vfs-netatalk
-Summary:       VFS module for ease co-existence of samba and netatalk
-Summary(pl.UTF-8):     Moduł VFS ułatwiający współpracę serwisów samba i netatalk
+Summary:       VFS module for ease co-existence of Samba and netatalk
+Summary(pl.UTF-8):     Moduł VFS ułatwiający współpracę serwisów Samba i netatalk
 Group:         Networking/Daemons
 Requires:      samba3 = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-vfs-netatalk < 1:4.0.0-1
 
 %description -n samba3-vfs-netatalk
 Package contains a netatalk VFS module for ease co-existence of Samba
 and netatalk file sharing services.
 
 %description -n samba3-vfs-netatalk -l pl.UTF-8
-Pakiet zawiera moduł VFS netatalk umożliwiający współpracę usług samba
+Pakiet zawiera moduł VFS netatalk umożliwiający współpracę usług Samba
 i netatalk przy udostępnianiu zasobów.
 
 %package -n samba3-vfs-recycle
-Summary:       VFS module to add recycle bin facility to a samba share
-Summary(pl.UTF-8):     Moduł VFS dodający funkcję kosza do zasobu Samby
+Summary:       VFS module to add recycle bin facility to a Samba share
+Summary(pl.UTF-8):     Moduł VFS dodający możliwość kosza do zasobu Samby
 Group:         Networking/Daemons
 Requires:      samba3 = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-vfs-recycle < 1:4.0.0-1
 
 %description -n samba3-vfs-recycle
-VFS module to add recycle bin facility to a samba share.
+VFS module to add recycle bin facility to a Samba share.
 
 %description -n samba3-vfs-recycle -l pl.UTF-8
-Moduł VFS dodający możliwość kosza do zasobu samby.
+Moduł VFS dodający możliwość kosza do zasobu Samby.
 
 %package -n samba3-vfs-readahead
 Summary:       VFS module for pre-loading the kernel buffer cache
 Summary(pl.UTF-8):     Moduł VFS do wczesnego odczytu danych do bufora cache jądra
 Group:         Networking/Daemons
 Requires:      samba3 = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-vfs-readahead < 1:4.0.0-1
 
 %description -n samba3-vfs-readahead
 This VFS module detects read requests at multiples of a given offset
@@ -737,6 +601,7 @@ Summary:    VFS module for read-only limitation for specified share
 Summary(pl.UTF-8):     Moduł VFS do ograniczania określonego udziału tylko do odczytu
 Group:         Networking/Daemons
 Requires:      samba3 = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-vfs-readonly < 1:4.0.0-1
 
 %description -n samba3-vfs-readonly
 This module performs a read-only limitation for specified share (or
@@ -748,156 +613,151 @@ Ten moduł wprowadza ograniczenie tylko do odczytu dla określonego
 udziału (lub wszystkich, jeśli jest wczytywany w sekcji [global]) w
 oparciu o definicje okresów w smb.conf.
 
-%package -n samba3-vfs-shadow_copy
-Summary:       VFS module to make automatic copy of data in samba share
-Summary(pl.UTF-8):     Moduł VFS do tworzenia automatycznych kopii danych w zasobach samby
-Group:         Networking/Daemons
-Requires:      samba3 = %{epoch}:%{version}-%{release}
-
-%description -n samba3-vfs-shadow_copy
-VFS module to make automatic copy of data in samba share.
-
-%description -n samba3-vfs-shadow_copy -l pl.UTF-8
-Moduł VFS do tworzenia automatycznych kopii danych w zasobach samby.
-
-%package -n samba3-vfs-catia
-Summary:       VFS module to fix Catia CAD filenames
-Group:         Networking/Daemons
-Requires:      samba3 = %{epoch}:%{version}-%{release}
-
-%description -n samba3-vfs-catia
-The Catia CAD package commonly creates filenames that use characters
-that are illegal in CIFS filenames. The vfs_catia VFS module
-implements a fixed character mapping so that these files can be shared
-with CIFS clients.
-
 %package -n samba3-vfs-scannedonly
 Summary:       Anti-virus solution as VFS module
 Summary(pl.UTF-8):     Rozwiązanie antywirusowe jako moduł VFS
 Group:         Networking/Daemons
 Requires:      samba3 = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-vfs-scannedonly < 1:4.0.0-1
 
 %description -n samba3-vfs-scannedonly
 The vfs_scannedonly VFS module ensures that only files that have been
 scanned for viruses are visible and accessible to the end user. If
 non-scanned files are found an anti-virus scanning daemon is notified.
 
-%description vfs-scannedonly -l pl.UTF-8
+%description -n samba3-vfs-scannedonly -l pl.UTF-8
 Moduł VFS vfs_scannedonly zapewnia, że tylko pliki, które zostały
 wcześniej przeskanowane pod kątem wirusów, są widoczne i dostępne dla
 użytkownika końcowego. Jeśli zostaną znalezione pliki nie
 przeskanowane, powiadamiany jest antywirusowy demon skanujący.
 
-%package vfs-shadow_copy
+%package -n samba3-vfs-shadow_copy
 Summary:       VFS module to make automatic copy of data in Samba share
 Summary(pl.UTF-8):     Moduł VFS do tworzenia automatycznych kopii danych w zasobach Samby
 Group:         Networking/Daemons
-Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      samba3 = %{epoch}:%{version}-%{release}
+Obsoletes:     samba-vfs-shadow_copy < 1:4.0.0-1
 
-%description vfs-shadow_copy
+%description -n samba3-vfs-shadow_copy
 VFS module to make automatic copy of data in Samba share.
 
-%description vfs-shadow_copy -l pl.UTF-8
+%description -n samba3-vfs-shadow_copy -l pl.UTF-8
 Moduł VFS do tworzenia automatycznych kopii danych w zasobach Samby.
 
-%package -n openldap-schema-samba
-Summary:       Samba LDAP schema
-Summary(pl.UTF-8):     Schemat LDAP dla samby
-Group:         Networking/Daemons
-Requires(post,postun): sed >= 4.0
-Requires:      openldap-servers
-%if "%{_rpmversion}" >= "5"
-BuildArch:     noarch
-%endif
+%package -n smbget3
+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
+Obsoletes:     smbget < 1:4.0.8-3
 
-%description -n openldap-schema-samba
-This package contains samba.schema for OpenLDAP.
+%description -n smbget3
+wget-like utility for downloading files over SMB.
 
-%description -n openldap-schema-samba -l pl.UTF-8
-Ten pakiet zawiera schemat Samby (samba.schema) dla OpenLDAP-a.
+%description -n smbget3 -l pl.UTF-8
+Narzędzie podobne do wgeta do pobierania plików protokołem SMB
+używanym w sieciach MS Windows.
 
-%package -n python-samba4
-Summary:       Samba Module for Python
-Group:         Development/Languages/Python
-%pyrequires_eq python
-Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+%package -n cups-backend-smb3
+Summary:       CUPS backend for printing to SMB printers
+Summary(pl.UTF-8):     Backend CUPS-a drukujący na drukarkach SMB
+Group:         Applications/Printing
+Requires:      samba3-client = %{epoch}:%{version}-%{release}
+Requires:      cups >= 1:1.2.0
+Obsoletes:     cups-backend-smb < 1:4.0.8-3
 
-%description -n python-samba4
-Samba Module for Python.
+%description -n cups-backend-smb3
+CUPS backend for printing to SMB printers.
 
-%package -n python-samba3
-Summary:       Samba Module for Python
-Group:         Development/Languages/Python
-%pyrequires_eq python
-Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+%description -n cups-backend-smb3 -l pl.UTF-8
+Backend CUPS-a drukujący na drukarkach SMB.
 
-%description -n python-samba3
-Samba Module for Python.
+%package -n samba3-winbind
+Summary:       Samba-winbind daemon, utilities and documentation
+Summary(pl.UTF-8):     Demon samba-winbind, narzędzia i dokumentacja
+Group:         Networking/Daemons
+Requires(post,preun):  /sbin/chkconfig
+Requires:      samba3-common = %{epoch}:%{version}-%{release}
+Requires:      systemd-units >= 38
+Obsoletes:     samba-winbind < 1:4.0.0-1
 
-%package test
-Summary:       Testing tools for Samba servers and clients
-Group:         Applications/System
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      %{name}-common = %{epoch}:%{version}-%{release}
-Requires:      %{name}-winbind = %{epoch}:%{version}-%{release}
+%description -n samba3-winbind
+Provides the winbind daemon and testing tools to allow authentication
+and group/user enumeration from a Windows or Samba domain controller.
 
-%description test
-samba4-test provides testing tools for both the server and client
-packages of Samba.
-
-%package test-devel
-Summary:       Testing devel files for Samba servers and clients
-Group:         Applications/System
-Requires:      %{name}-test = %{epoch}:%{version}-%{release}
+%description -n samba3-winbind -l pl.UTF-8
+Pakiet zawiera demona winbind oraz narzędzia testowe. Umożliwia
+uwierzytelnianie i wyliczanie grup/użytkowników z kontrolera domeny
+Windows lub Samba.
 
-%description test-devel
-samba-test-devel provides testing devel files for both the server and
-client packages of Samba.
+%package -n nss_wins3
+Summary:       Name Service Switch service for WINS
+Summary(pl.UTF-8):     Usługa Name Service Switch dla WINS
+Group:         Base
+Requires:      %{name}-common = %{epoch}:%{version}-%{release}
+Obsoletes:     nss_wins < 1:4.0.8-3
 
-%package pidl
-Summary:       Perl IDL compiler
-Group:         Development/Tools
-Requires:      perl(Parse::Yapp)
+%description -n nss_wins3
+Provides the libnss_wins shared library which resolves NetBIOS names
+to IP addresses.
 
-%description pidl
-The samba4-pidl package contains the Perl IDL compiler used by Samba
-and Wireshark to parse IDL and similar protocols.
+%description -n nss_wins3 -l pl.UTF-8
+Biblioteka dzielona libnss_wins rozwiązująca nazwy NetBIOS na adresy
+IP.
 
-%package -n samba3
-Summary:       samba3
-Group:         Networking/Daemons
+%package -n samba3-libsmbclient
+Summary:       libsmbclient and libwbclient - Samba client libraries
+Summary(pl.UTF-8):     libsmbclient i libwbclient - biblioteki klienckie Samby
+Group:         Libraries
+Obsoletes:     libsmbclient
 
-%description -n samba3
-samba3
+%description -n samba3-libsmbclient
+libsmbclient and libwbclient - libraries that allow to use Samba
+client functions.
 
-%package -n samba3-common
-Summary:       samba3
-Group:         Networking/Daemons
+%description -n samba3-libsmbclient -l pl.UTF-8
+libsmbclient i libwbclient - biblioteki pozwalające korzystać z funcji
+klienta Samby.
 
-%description -n samba3-common
-samba3
+%package -n samba3-libsmbclient-devel
+Summary:       Development files for Samba client libraries
+Summary(pl.UTF-8):     Pliki programistyczne bibliotek klienta Samby
+Group:         Development/Libraries
+Requires:      samba3-libsmbclient = %{epoch}:%{version}-%{release}
+Provides:      libsmbclient-devel
+Obsoletes:     libsmbclient-devel
+Obsoletes:     libsmbclient-static
 
-%package -n samba3-client
-Summary:       samba3
-Group:         Networking/Daemons
+%description -n samba3-libsmbclient-devel
+Header files for libsmbclient and libwbclient libraries.
 
-%description -n samba3-client
-samba3
+%description -n samba3-libsmbclient-devel -l pl.UTF-8
+Pliki nagłówkowe bibliotek libsmbclient i libwbclient.
 
-%package todo
-Summary:       todo
+%package -n openldap-schema-samba3
+Summary:       Samba LDAP schema
+Summary(pl.UTF-8):     Schemat LDAP dla Samby
 Group:         Networking/Daemons
+Requires(post,postun): sed >= 4.0
+Requires:      openldap-servers
+Obsoletes:     openldap-schema-samba < 1:4.0.0-1
 
-%description todo
-todo
+%description -n openldap-schema-samba3
+This package contains samba.schema for OpenLDAP.
+
+%description -n openldap-schema-samba3 -l pl.UTF-8
+Ten pakiet zawiera schemat Samby (samba.schema) dla OpenLDAP-a.
 
 %prep
 %setup -q -n samba-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch3 -p1
 %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
 
 %build
 LDFLAGS="${LDFLAGS:-%rpmldflags}" \
@@ -928,10 +788,9 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
        --with-pammodulesdir=/%{_lib}/security \
        --with-lockdir=/var/lib/samba \
        --with-privatedir=%{_sysconfdir}/samba \
-       --disable-gnutls \
        --disable-rpath-install \
        --builtin-libraries=replace,ccan \
-       --bundled-libraries=NONE,subunit,iniparser,%{!?with_system_libs:talloc,tdb,ldb,tevent,pytalloc,pytalloc-util,pytdb,pytevent,pyldb,pyldb-util} \
+       --bundled-libraries=NONE,subunit,iniparser,ntdb,%{!?with_system_libs:talloc,tdb,ldb,tevent,pytalloc,pytalloc-util,pytdb,pytevent,pyldb,pyldb-util} \
        --private-libraries=smbclient,smbsharemodes,wbclient \
        --with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2,pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4,auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 \
        --with-acl-support \
@@ -945,8 +804,8 @@ CPPFLAGS="${CPPFLAGS:-%rpmcppflags}" \
        --with-pam \
        --with-pam_smbpass \
        --with-quotas \
+       --with-regedit \
        --with-sendfile-support \
-       --with-swat \
        --with-syslog \
        --with-utmp \
        --with-winbind \
@@ -964,7 +823,7 @@ cd pidl
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,pam.d,security,sysconfig/rc-inetd} \
+install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,pam.d,security,sysconfig/rc-inetd,ld.so.conf.d,env.d} \
        $RPM_BUILD_ROOT{/var/{log/archive,spool}/samba,/var/lib/samba/printing} \
        $RPM_BUILD_ROOT/var/log/samba/cores/{smbd,nmbd} \
        $RPM_BUILD_ROOT{/sbin,/%{_lib}/security,%{_libdir},%{_libdir}/samba/vfs,%{_includedir},%{_sambahome},%{schemadir}} \
@@ -986,6 +845,7 @@ cd ..
 # 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
 
 # not ready for production, and no MIT kerberos in PLD
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/mit_samba.so
@@ -1000,12 +860,15 @@ install packaging/systemd/winbind.service $RPM_BUILD_ROOT%{systemdunitdir}
 
 install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
 cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/samba
-install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/swat
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/samba
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/logrotate.d/samba
+cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/logrotate.d/samba3
 cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
 install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/winbind
 cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/winbind
+install -p %{SOURCE9} $RPM_BUILD_ROOT/etc/rc.d/init.d/samba
+
+echo "LDB_MODULES_PATH=%{_libdir}/samba/ldb" > $RPM_BUILD_ROOT/etc/env.d/LDB_MODULES_PATH
 
 # move lib{smb,wb}client where they always were for compatibility
 %{__mv} $RPM_BUILD_ROOT%{_libdir}/samba/libsmbclient.so.* $RPM_BUILD_ROOT%{_libdir}
@@ -1023,6 +886,8 @@ touch $RPM_BUILD_ROOT/var/lib/samba/{wins.dat,browse.dat}
 
 echo '127.0.0.1 localhost' > $RPM_BUILD_ROOT%{_sysconfdir}/samba/lmhosts
 
+echo "%{_libdir}/samba" >$RPM_BUILD_ROOT/etc/ld.so.conf.d/samba.conf
+
 %if %{with cups}
 install -d $RPM_BUILD_ROOT%{cups_serverbin}/backend
 ln -s %{_bindir}/smbspool $RPM_BUILD_ROOT%{cups_serverbin}/backend/smb
@@ -1035,32 +900,30 @@ ln -s %{_bindir}/smbspool $RPM_BUILD_ROOT%{cups_serverbin}/backend/smb
 install examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir}
 %endif
 
-%if %{with system_libtdb}
-# remove manuals of tdb if system lib used
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/tdbbackup.8*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/tdbdump.8*
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/tdbtool.8*
-%endif
+# remove man pages for not installed commands
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/log2pcap.1*
+%{__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*
 
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
-find $RPM_BUILD_ROOT%{py_sitedir} -name "*.py" -o -name "*.a" -o -name "*.la" | xargs rm -f
+%py_postclean
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/sbin/chkconfig --add smb
-%service smb restart "Samba daemons"
-#systemd_post smb.service nmb.service
+/sbin/chkconfig --add samba
+%service samba restart "Samba AD daemon"
 %systemd_post samba.service
 
 %preun
 if [ "$1" = "0" ]; then
-       %service smb stop
-       /sbin/chkconfig --del smb
+       %service samba stop
+       /sbin/chkconfig --del samba
 fi
-#systemd_preun smb.service nmb.service
 %systemd_preun samba.service
 
 %postun
@@ -1069,87 +932,85 @@ fi
 %post common -p /sbin/ldconfig
 %postun common -p /sbin/ldconfig
 
-%post winbind
+%post -n python-samba4 -p /sbin/ldconfig
+%postun -n python-samba4 -p /sbin/ldconfig
+
+%post -n samba3-server
+/sbin/chkconfig --add smb
+%service smb restart "Samba3 daemons"
+%systemd_post smb.service nmb.service
+
+%preun -n samba3-server
+if [ "$1" = "0" ]; then
+       %service smb stop
+       /sbin/chkconfig --del smb
+fi
+%systemd_preun smb.service nmb.service
+
+%postun -n samba3-server
+%systemd_reload
+
+%triggerpostun -n samba3-server -- samba < 1:4.0.0-1
+/sbin/chkconfig --add smb
+%service smb restart "Samba3 daemons"
+%systemd_post smb.service nmb.service
+
+%post -n samba3-winbind
 /sbin/chkconfig --add winbind
 %service winbind restart "Winbind daemon"
 %systemd_post winbind.service
 
-%preun winbind
+%preun -n samba3-winbind
 if [ "$1" = "0" ]; then
        %service winbind stop
        /sbin/chkconfig --del winbind
 fi
 %systemd_preun winbind.service
 
-%postun winbind
+%postun -n samba3-winbind
 %systemd_reload
 
-%post -n samba3-swat
-%service -q rc-inetd reload
-
-%postun -n samba3-swat
-if [ "$1" = 0 ]; then
-       %service -q rc-inetd reload
-fi
+%triggerpostun -n samba3-winbind -- samba-winbind < 1:4.0.0-1
+/sbin/chkconfig --add winbind
+%service winbind restart "Winbind daemon"
+%systemd_post winbind.service
 
-%post -n openldap-schema-samba
+%post -n openldap-schema-samba3
 # dependant schemas: cosine(uid) inetorgperson(displayName) nis(gidNumber)
 %openldap_schema_register %{schemadir}/samba.schema -d cosine,inetorgperson,nis
 %service -q ldap restart
 
-%postun -n openldap-schema-samba
+%postun -n openldap-schema-samba3
 if [ "$1" = "0" ]; then
        %openldap_schema_unregister %{schemadir}/samba.schema
        %service -q ldap restart
 fi
 
+%triggerpostun -n openldap-schema-samba3 -- openldap-schema-samba < 1:4.0.0-1
+# dependant schemas: cosine(uid) inetorgperson(displayName) nis(gidNumber)
+%openldap_schema_register %{schemadir}/samba.schema -d cosine,inetorgperson,nis
+%service -q ldap restart
+
 %files
 %defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/env.d/LDB_MODULES_PATH
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/samba
+%attr(754,root,root) /etc/rc.d/init.d/samba
 %{systemdunitdir}/samba.service
 %{systemdtmpfilesdir}/samba.conf
 %attr(755,root,root) %{_bindir}/oLschema2ldif
 %attr(755,root,root) %{_sbindir}/samba
 %attr(755,root,root) %{_sbindir}/samba_dnsupdate
+%attr(755,root,root) %{_sbindir}/samba_kcc
 %attr(755,root,root) %{_sbindir}/samba_spnupdate
 %attr(755,root,root) %{_sbindir}/samba_upgradedns
-%attr(755,root,root) %{_sbindir}/samba_upgradeprovision
-%attr(755,root,root) %{_libdir}/libdcerpc-server.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libdcerpc-server.so.0
-
-
-%attr(755,root,root) %{_libdir}/samba/libdb-glue.so
 %attr(755,root,root) %{_libdir}/samba/libdsdb-module.so
-%attr(755,root,root) %{_libdir}/samba/libHDB_SAMBA4.so
-%attr(755,root,root) %{_libdir}/samba/libntvfs.so
 %attr(755,root,root) %{_libdir}/samba/libpac.so
-%attr(755,root,root) %{_libdir}/samba/libprocess_model.so
-%attr(755,root,root) %{_libdir}/samba/libservice.so
-%attr(755,root,root) %{_libdir}/samba/libshares.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
 %dir %{_libdir}/samba/hdb
 %attr(755,root,root) %{_libdir}/samba/hdb/hdb_samba4.so
-%dir %{_libdir}/samba/process_model
-%attr(755,root,root) %{_libdir}/samba/process_model/onefork.so
-%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
-%attr(755,root,root) %{_libdir}/samba/service/dcerpc.so
-%attr(755,root,root) %{_libdir}/samba/service/dns.so
-%attr(755,root,root) %{_libdir}/samba/service/dns_update.so
-%attr(755,root,root) %{_libdir}/samba/service/drepl.so
-%attr(755,root,root) %{_libdir}/samba/service/kcc.so
-%attr(755,root,root) %{_libdir}/samba/service/kdc.so
-%attr(755,root,root) %{_libdir}/samba/service/ldap.so
-%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/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/wrepl.so
 %dir %{_libdir}/samba/gensec
 %attr(755,root,root) %{_libdir}/samba/gensec/krb5.so
 %dir %{_libdir}/samba/ldb
@@ -1193,33 +1054,30 @@ fi
 %attr(755,root,root) %{_libdir}/samba/ldb/subtree_rename.so
 %attr(755,root,root) %{_libdir}/samba/ldb/update_keytab.so
 %attr(755,root,root) %{_libdir}/samba/ldb/wins_ldb.so
+%dir %{_libdir}/samba/process_model
+%attr(755,root,root) %{_libdir}/samba/process_model/onefork.so
+%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
+%attr(755,root,root) %{_libdir}/samba/service/dcerpc.so
+%attr(755,root,root) %{_libdir}/samba/service/dns.so
+%attr(755,root,root) %{_libdir}/samba/service/dns_update.so
+%attr(755,root,root) %{_libdir}/samba/service/drepl.so
+%attr(755,root,root) %{_libdir}/samba/service/kcc.so
+%attr(755,root,root) %{_libdir}/samba/service/kdc.so
+%attr(755,root,root) %{_libdir}/samba/service/ldap.so
+%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/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/wrepl.so
 %{_datadir}/samba/setup
 %{_mandir}/man1/oLschema2ldif.1*
 %{_mandir}/man8/samba.8*
 
-%files winbind
-%defattr(644,root,root,755)
-# winbind4
-%attr(755,root,root) %{_bindir}/wbinfo
-%attr(755,root,root) /%{_lib}/security/pam_winbind*
-%attr(755,root,root) /%{_lib}/libnss_winbind*
-%attr(755,root,root) %{_libdir}/winbind_krb5_locator.so
-%{_mandir}/man1/wbinfo*.1*
-%{_mandir}/man5/pam_winbind.conf.5*
-%{_mandir}/man7/winbind_krb5_locator.7*
-%{_mandir}/man8/pam_winbind.8*
-
-%files -n samba3-winbind
-%attr(755,root,root) %{_sbindir}/winbindd
-%attr(754,root,root) /etc/rc.d/init.d/winbind
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/winbind
-%{systemdunitdir}/winbind.service
-%{_mandir}/man8/winbindd*.8*
-
-%files -n nss_wins
-%defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/libnss_wins*
-
 %files client
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cifsdd
@@ -1233,28 +1091,11 @@ fi
 %files common
 %defattr(644,root,root,755)
 %doc README WHATSNEW.txt Roadmap
-%attr(755,root,root) %{_sbindir}/samba_kcc
+/etc/ld.so.conf.d/samba.conf
+%attr(755,root,root) %{_bindir}/samba-regedit
 %attr(755,root,root) %{_bindir}/samba-tool
 %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
-%dir %{_datadir}/samba
-%dir %{_datadir}/samba/codepages
-%{_datadir}/samba/codepages/lowcase.dat
-%{_datadir}/samba/codepages/upcase.dat
-%{_datadir}/samba/codepages/valid.dat
-%{_mandir}/man8/samba-tool.8*
-%{_mandir}/man5/lmhosts.5*
-%{_mandir}/man5/smb.conf.5*
-%{_mandir}/man7/samba.7*
-%if %{without system_libs}
-%attr(755,root,root) %{_bindir}/tdbbackup
-%attr(755,root,root) %{_bindir}/tdbdump
-%attr(755,root,root) %{_bindir}/tdbtool
-%{_mandir}/man8/tdbbackup.8*
-%{_mandir}/man8/tdbdump.8*
-%{_mandir}/man8/tdbtool.8*
-%endif
 %attr(755,root,root) %{_libdir}/libdcerpc.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libdcerpc.so.0
 %attr(755,root,root) %{_libdir}/libdcerpc-atsvc.so.*.*.*
@@ -1263,18 +1104,20 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libdcerpc-binding.so.0
 %attr(755,root,root) %{_libdir}/libdcerpc-samr.so.*.*.*
 %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}/libgensec.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgensec.so.0
+%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) %{_libdir}/libndr-krb5pac.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libndr-krb5pac.so.0
-%attr(755,root,root) %{_libdir}/libndr-nbt.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libndr-nbt.so.0
-%attr(755,root,root) %{_libdir}/libndr-standard.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libndr-standard.so.0
 %attr(755,root,root) %{_libdir}/libregistry.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libregistry.so.0
+%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.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsamba-credentials.so.0
 %attr(755,root,root) %{_libdir}/libsamba-hostconfig.so.*.*.*
@@ -1283,127 +1126,161 @@ fi
 %attr(755,root,root) %ghost %{_libdir}/libsamba-util.so.0
 %attr(755,root,root) %{_libdir}/libsamdb.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libsamdb.so.0
+%attr(755,root,root) %{_libdir}/libsmbclient-raw.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsmbclient-raw.so.0
 %attr(755,root,root) %{_libdir}/libtevent-util.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libtevent-util.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}/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
 %dir %{_libdir}/samba
-%attr(755,root,root) %{_libdir}/samba/libauth_unix_token.so
-%attr(755,root,root) %{_libdir}/samba/libdcerpc-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libsamba_python.so
-%attr(755,root,root) %{_libdir}/samba/libsmbpasswdparser.so
+%attr(755,root,root) %{_libdir}/samba/libCHARSET3.so
 %attr(755,root,root) %{_libdir}/samba/libLIBWBCLIENT_OLD.so
-%attr(755,root,root) %{_libdir}/samba/libauth4.so
-%attr(755,root,root) %{_libdir}/samba/libcluster.so
-%attr(755,root,root) %{_libdir}/samba/libdfs_server_ad.so
-%attr(755,root,root) %{_libdir}/samba/libndr-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libposix_eadb.so
-%attr(755,root,root) %{_libdir}/samba/libsamba-net.so
-%attr(755,root,root) %{_libdir}/samba/libcli_cldap.so
-%attr(755,root,root) %{_libdir}/samba/libsmbd_shim.so
-%attr(755,root,root) %{_libdir}/samba/libcli-nbt.so
-%attr(755,root,root) %{_libdir}/samba/libcliauth.so
-%attr(755,root,root) %{_libdir}/samba/libcli-ldap.so
-%attr(755,root,root) %{_libdir}/samba/libsamba3-util.so
-%attr(755,root,root) %{_libdir}/samba/libcli-ldap-common.so
-%attr(755,root,root) %{_libdir}/samba/libcli_smb_common.so
-%attr(755,root,root) %{_libdir}/samba/libutil_reg.so
-%attr(755,root,root) %{_libdir}/samba/libcmdline-credentials.so
 %attr(755,root,root) %{_libdir}/samba/libMESSAGING.so
-%attr(755,root,root) %{_libdir}/samba/libauth_sam_reply.so
-%attr(755,root,root) %{_libdir}/samba/libinterfaces.so
 %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/libauth.so
+%attr(755,root,root) %{_libdir}/samba/libauth4.so
+%attr(755,root,root) %{_libdir}/samba/libauth_sam_reply.so
+%attr(755,root,root) %{_libdir}/samba/libauth_unix_token.so
 %attr(755,root,root) %{_libdir}/samba/libauthkrb5.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_cldap.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/libcliauth.so
+%attr(755,root,root) %{_libdir}/samba/libcluster.so
+%attr(755,root,root) %{_libdir}/samba/libcmdline-credentials.so
 %attr(755,root,root) %{_libdir}/samba/libdbwrap.so
 %attr(755,root,root) %{_libdir}/samba/libdcerpc-samba.so
+%attr(755,root,root) %{_libdir}/samba/libdcerpc-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libdfs_server_ad.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/libgse.so
 %attr(755,root,root) %{_libdir}/samba/libiniparser.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/libmsrpc3.so
 %attr(755,root,root) %{_libdir}/samba/libndr-samba.so
+%attr(755,root,root) %{_libdir}/samba/libndr-samba4.so
 %attr(755,root,root) %{_libdir}/samba/libnetif.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/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/libsamba-modules.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/libsamba3-util.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/libsmb_transport.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/libsmbpasswdparser.so
+%attr(755,root,root) %{_libdir}/samba/libsmbregistry.so
 %attr(755,root,root) %{_libdir}/samba/libtdb-wrap.so
+%attr(755,root,root) %{_libdir}/samba/libtdb_compat.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/libwinbind-client.so
+%attr(755,root,root) %{_libdir}/samba/libxattr_tdb.so
+%dir %{_libdir}/samba/vfs
+%attr(755,root,root) %{_libdir}/samba/vfs/acl_xattr.so
+%attr(755,root,root) %{_libdir}/samba/vfs/btrfs.so
+#%attr(755,root,root) %{_libdir}/samba/vfs/ceph.so
+%attr(755,root,root) %{_libdir}/samba/vfs/fileid.so
+%attr(755,root,root) %{_libdir}/samba/vfs/glusterfs.so
+%attr(755,root,root) %{_libdir}/samba/vfs/posix_eadb.so
+%attr(755,root,root) %{_libdir}/samba/vfs/xattr_tdb.so
+%dir %{_datadir}/samba
+%dir %{_datadir}/samba/codepages
+%{_datadir}/samba/codepages/lowcase.dat
+%{_datadir}/samba/codepages/upcase.dat
+%{_datadir}/samba/codepages/valid.dat
+%{_mandir}/man5/lmhosts.5*
+%{_mandir}/man5/smb.conf.5*
+%{_mandir}/man7/samba.7*
+%{_mandir}/man8/samba-regedit.8*
+%{_mandir}/man8/samba-tool.8*
+%{_mandir}/man8/vfs_acl_xattr.8*
+%{_mandir}/man8/vfs_btrfs.8*
+%{_mandir}/man8/vfs_fileid.8*
+%{_mandir}/man8/vfs_xattr_tdb.8*
+
+# TODO
+%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) %{_libdir}/samba/libntdb.so.*
+%{_mandir}/man8/ntdbbackup.8*
+%{_mandir}/man8/ntdbdump.8*
+%{_mandir}/man8/ntdbrestore.8*
+%{_mandir}/man8/ntdbtool.8*
 %if %{without system_libs}
+%attr(755,root,root) %{_bindir}/tdbbackup
+%attr(755,root,root) %{_bindir}/tdbdump
+%attr(755,root,root) %{_bindir}/tdbtool
 %attr(755,root,root) %{_libdir}/samba/libtalloc.so.*
 %attr(755,root,root) %{_libdir}/samba/libtdb.so.*
+%{_mandir}/man8/tdbbackup.8*
+%{_mandir}/man8/tdbdump.8*
+%{_mandir}/man8/tdbtool.8*
 %endif
 
-%files -n pam-pam_smbpass
-%defattr(644,root,root,755)
-%doc source3/pam_smbpass/{CHAN*,README,TODO} source3/pam_smbpass/samples
-%attr(755,root,root) /%{_lib}/security/pam_smbpass.so
-
-%files -n libsmbclient-raw
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsmbclient-raw.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsmbclient-raw.so.0
-
-%files -n libsmbclient-raw-devel
-%defattr(644,root,root,755)
-%{_includedir}/samba-4.0/gen_ndr/drsblobs.h
-%{_includedir}/samba-4.0/gen_ndr/drsuapi.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_drsblobs.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_drsuapi.h
-%{_includedir}/samba-4.0/ndr/ndr_drsblobs.h
-%{_includedir}/samba-4.0/ndr/ndr_drsuapi.h
-%{_includedir}/samba-4.0/read_smb.h
-%{_includedir}/samba-4.0/smb2.h
-%{_includedir}/samba-4.0/smb2_constants.h
-%{_includedir}/samba-4.0/smb2_create_blob.h
-%{_includedir}/samba-4.0/smb2_signing.h
-%{_includedir}/samba-4.0/smb_cli.h
-%{_includedir}/samba-4.0/smb_cliraw.h
-%{_includedir}/samba-4.0/smb_common.h
-%{_includedir}/samba-4.0/smb_composite.h
-%{_includedir}/samba-4.0/smb_constants.h
-%{_includedir}/samba-4.0/smb_raw.h
-%{_includedir}/samba-4.0/smb_raw_interfaces.h
-%{_includedir}/samba-4.0/smb_raw_signing.h
-%{_includedir}/samba-4.0/smb_raw_trans2.h
-%{_includedir}/samba-4.0/smb_request.h
-%{_includedir}/samba-4.0/smb_seal.h
-%{_includedir}/samba-4.0/smb_signing.h
-%{_includedir}/samba-4.0/smb_unix_ext.h
-%{_includedir}/samba-4.0/smb_util.h
-%attr(755,root,root) %{_libdir}/libsmbclient-raw.so
-%{_pkgconfigdir}/smbclient-raw.pc
-
-%files -n samba3-libsmbclient
+%files common-server
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsmbclient.so.*
-%attr(755,root,root) %{_libdir}/libsmbconf.so.0
-%attr(755,root,root) %{_libdir}/libwbclient.so.*
-%{_mandir}/man7/libsmbclient.7*
-%attr(755,root,root) %{_libdir}/samba/libCHARSET3.so
-%attr(755,root,root) %{_libdir}/samba/libgse.so
-%attr(755,root,root) %{_libdir}/samba/liblibcli_lsa3.so
-%attr(755,root,root) %{_libdir}/samba/liblibsmb.so
-%attr(755,root,root) %{_libdir}/samba/libmsrpc3.so
-%attr(755,root,root) %{_libdir}/samba/libsecrets3.so
-%attr(755,root,root) %{_libdir}/samba/libsmbregistry.so
-%attr(755,root,root) %{_libdir}/samba/libutil_cmdline.so
+%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/smbusers
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/samba
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/samba
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.samba
 
-%files -n samba3-libsmbclient-devel
+%dir %{_sambahome}
+%dir /var/lib/samba
+%ghost /var/lib/samba/*.dat
+%dir /var/lib/samba/printing
+
+%attr(750,root,root) %dir /var/log/samba
+%attr(750,root,root) %dir /var/log/samba/cores
+%attr(750,root,root) %dir /var/log/samba/cores/smbd
+%attr(750,root,root) %dir /var/log/samba/cores/nmbd
+%attr(750,root,root) %dir /var/log/archive/samba
+%attr(1777,root,root) %dir /var/spool/samba
+%if %{with ldap}
+%doc examples/LDAP
+%endif
+
+%files winbind
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libsmbclient.so
-%attr(755,root,root) %{_libdir}/libsmbconf.so
-%attr(755,root,root) %{_libdir}/libwbclient.so
-%{_includedir}/libsmbclient.h
-%{_includedir}/wbclient.h
+%attr(755,root,root) %{_bindir}/wbinfo
+%attr(755,root,root) /%{_lib}/security/pam_winbind*
+%attr(755,root,root) /%{_lib}/libnss_winbind*
+%attr(755,root,root) %{_libdir}/winbind_krb5_locator.so
+%{_mandir}/man1/wbinfo*.1*
+%{_mandir}/man5/pam_winbind.conf.5*
+%{_mandir}/man7/winbind_krb5_locator.7*
+%{_mandir}/man8/pam_winbind.8*
 
 %files devel
 %defattr(644,root,root,755)
@@ -1423,51 +1300,77 @@ fi
 %{_includedir}/samba-4.0/gen_ndr/atsvc.h
 %{_includedir}/samba-4.0/gen_ndr/auth.h
 %{_includedir}/samba-4.0/gen_ndr/dcerpc.h
+%{_includedir}/samba-4.0/gen_ndr/drsblobs.h
+%{_includedir}/samba-4.0/gen_ndr/drsuapi.h
 %{_includedir}/samba-4.0/gen_ndr/epmapper.h
 %{_includedir}/samba-4.0/gen_ndr/krb5pac.h
 %{_includedir}/samba-4.0/gen_ndr/lsa.h
 %{_includedir}/samba-4.0/gen_ndr/mgmt.h
 %{_includedir}/samba-4.0/gen_ndr/misc.h
 %{_includedir}/samba-4.0/gen_ndr/nbt.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_atsvc_c.h
 %{_includedir}/samba-4.0/gen_ndr/ndr_atsvc.h
+%{_includedir}/samba-4.0/gen_ndr/ndr_atsvc_c.h
 %{_includedir}/samba-4.0/gen_ndr/ndr_dcerpc.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_epmapper_c.h
+%{_includedir}/samba-4.0/gen_ndr/ndr_drsblobs.h
+%{_includedir}/samba-4.0/gen_ndr/ndr_drsuapi.h
 %{_includedir}/samba-4.0/gen_ndr/ndr_epmapper.h
+%{_includedir}/samba-4.0/gen_ndr/ndr_epmapper_c.h
 %{_includedir}/samba-4.0/gen_ndr/ndr_krb5pac.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_mgmt_c.h
 %{_includedir}/samba-4.0/gen_ndr/ndr_mgmt.h
+%{_includedir}/samba-4.0/gen_ndr/ndr_mgmt_c.h
 %{_includedir}/samba-4.0/gen_ndr/ndr_misc.h
 %{_includedir}/samba-4.0/gen_ndr/ndr_nbt.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_samr_c.h
 %{_includedir}/samba-4.0/gen_ndr/ndr_samr.h
-%{_includedir}/samba-4.0/gen_ndr/ndr_svcctl_c.h
+%{_includedir}/samba-4.0/gen_ndr/ndr_samr_c.h
 %{_includedir}/samba-4.0/gen_ndr/ndr_svcctl.h
+%{_includedir}/samba-4.0/gen_ndr/ndr_svcctl_c.h
 %{_includedir}/samba-4.0/gen_ndr/netlogon.h
 %{_includedir}/samba-4.0/gen_ndr/samr.h
 %{_includedir}/samba-4.0/gen_ndr/security.h
 %{_includedir}/samba-4.0/gen_ndr/server_id.h
 %{_includedir}/samba-4.0/gen_ndr/svcctl.h
 %{_includedir}/samba-4.0/gensec.h
+%{_includedir}/samba-4.0/ldap-util.h
 %{_includedir}/samba-4.0/ldap_errors.h
 %{_includedir}/samba-4.0/ldap_message.h
 %{_includedir}/samba-4.0/ldap_ndr.h
-%{_includedir}/samba-4.0/ldap-util.h
 %{_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_drsblobs.h
+%{_includedir}/samba-4.0/ndr/ndr_drsuapi.h
 %{_includedir}/samba-4.0/ndr/ndr_nbt.h
 %{_includedir}/samba-4.0/ndr/ndr_svcctl.h
 %{_includedir}/samba-4.0/param.h
 %{_includedir}/samba-4.0/policy.h
+%{_includedir}/samba-4.0/read_smb.h
 %{_includedir}/samba-4.0/registry.h
 %{_includedir}/samba-4.0/roles.h
 %{_includedir}/samba-4.0/rpc_common.h
 %dir %{_includedir}/samba-4.0/samba
 %{_includedir}/samba-4.0/samba/session.h
-%{_includedir}/samba-4.0/samba_util.h
 %{_includedir}/samba-4.0/samba/version.h
+%{_includedir}/samba-4.0/samba_util.h
 %{_includedir}/samba-4.0/share.h
+%{_includedir}/samba-4.0/smb2.h
+%{_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_signing.h
+%{_includedir}/samba-4.0/smb_cli.h
+%{_includedir}/samba-4.0/smb_cliraw.h
+%{_includedir}/samba-4.0/smb_common.h
+%{_includedir}/samba-4.0/smb_composite.h
+%{_includedir}/samba-4.0/smb_constants.h
+%{_includedir}/samba-4.0/smb_raw.h
+%{_includedir}/samba-4.0/smb_raw_interfaces.h
+%{_includedir}/samba-4.0/smb_raw_signing.h
+%{_includedir}/samba-4.0/smb_raw_trans2.h
+%{_includedir}/samba-4.0/smb_request.h
+%{_includedir}/samba-4.0/smb_seal.h
+%{_includedir}/samba-4.0/smb_signing.h
+%{_includedir}/samba-4.0/smb_unix_ext.h
+%{_includedir}/samba-4.0/smb_util.h
 %{_includedir}/samba-4.0/tdr.h
 %{_includedir}/samba-4.0/tsocket.h
 %{_includedir}/samba-4.0/tsocket_internal.h
@@ -1476,7 +1379,6 @@ fi
 %{_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_ldb.h
 %{_includedir}/samba-4.0/util/memory.h
 %{_includedir}/samba-4.0/util/safe_string.h
 %{_includedir}/samba-4.0/util/string_wrappers.h
@@ -1486,31 +1388,34 @@ fi
 %{_includedir}/samba-4.0/util/tevent_werror.h
 %{_includedir}/samba-4.0/util/time.h
 %{_includedir}/samba-4.0/util/xfile.h
-%{_libdir}/libdcerpc-atsvc.so
-%{_libdir}/libdcerpc-binding.so
-%{_libdir}/libdcerpc-samr.so
-%{_libdir}/libdcerpc-server.so
-%{_libdir}/libdcerpc.so
-%{_libdir}/libgensec.so
-%{_libdir}/libndr-krb5pac.so
-%{_libdir}/libndr-nbt.so
-%{_libdir}/libndr.so
-%{_libdir}/libndr-standard.so
-%{_libdir}/libregistry.so
-%{_libdir}/libsamba-credentials.so
-%{_libdir}/libsamba-hostconfig.so
-%{_libdir}/libsamba-policy.so
-%{_libdir}/libsamba-util.so
-%{_libdir}/libsamdb.so
-%{_libdir}/libtevent-util.so
-%{_pkgconfigdir}/dcerpc_atsvc.pc
+%{_includedir}/samba-4.0/util_ldb.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
+%attr(755,root,root) %{_libdir}/libdcerpc-server.so
+%attr(755,root,root) %{_libdir}/libdcerpc.so
+%attr(755,root,root) %{_libdir}/libgensec.so
+%attr(755,root,root) %{_libdir}/libndr-krb5pac.so
+%attr(755,root,root) %{_libdir}/libndr-nbt.so
+%attr(755,root,root) %{_libdir}/libndr-standard.so
+%attr(755,root,root) %{_libdir}/libndr.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-policy.so
+%attr(755,root,root) %{_libdir}/libsamba-util.so
+%attr(755,root,root) %{_libdir}/libsamdb.so
+%attr(755,root,root) %{_libdir}/libsmbclient-raw.so
+%attr(755,root,root) %{_libdir}/libsmbconf.so
+%attr(755,root,root) %{_libdir}/libtevent-util.so
 %{_pkgconfigdir}/dcerpc.pc
+%{_pkgconfigdir}/dcerpc_atsvc.pc
 %{_pkgconfigdir}/dcerpc_samr.pc
 %{_pkgconfigdir}/dcerpc_server.pc
 %{_pkgconfigdir}/gensec.pc
+%{_pkgconfigdir}/ndr.pc
 %{_pkgconfigdir}/ndr_krb5pac.pc
 %{_pkgconfigdir}/ndr_nbt.pc
-%{_pkgconfigdir}/ndr.pc
 %{_pkgconfigdir}/ndr_standard.pc
 %{_pkgconfigdir}/registry.pc
 %{_pkgconfigdir}/samba-credentials.pc
@@ -1518,15 +1423,32 @@ fi
 %{_pkgconfigdir}/samba-policy.pc
 %{_pkgconfigdir}/samba-util.pc
 %{_pkgconfigdir}/samdb.pc
+%{_pkgconfigdir}/smbclient-raw.pc
+# TODO
+#%if %{without system_libs}
+%{_mandir}/man3/ntdb.3*
+#%endif
 
-%if %{with ldap}
-%files -n openldap-schema-samba
+%files -n pam-pam_smbpass3
 %defattr(644,root,root,755)
-%{schemadir}/samba.schema
-%endif
+%doc source3/pam_smbpass/{CHAN*,README,TODO} source3/pam_smbpass/samples
+%attr(755,root,root) /%{_lib}/security/pam_smbpass.so
+
+%files pidl
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/pidl
+%{_mandir}/man1/pidl.1*
+%{_mandir}/man3/Parse::Pidl*.3*
+%{perl_vendorlib}/Parse/Pidl*
 
 %files -n python-samba4
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsamba-policy.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libsamba-policy.so.0
+%attr(755,root,root) %{_libdir}/samba/libHDB_SAMBA4.so
+%attr(755,root,root) %{_libdir}/samba/libdb-glue.so
+%attr(755,root,root) %{_libdir}/samba/libsamba-net.so
+%attr(755,root,root) %{_libdir}/samba/libsamba_python.so
 %dir %{py_sitedir}/samba
 %attr(755,root,root) %{py_sitedir}/samba/*.so
 %{py_sitedir}/samba/*.py[co]
@@ -1543,6 +1465,9 @@ fi
 %{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/tests
 %{py_sitedir}/samba/tests/*.py[co]
 %dir %{py_sitedir}/samba/tests/blackbox
@@ -1553,18 +1478,16 @@ fi
 %{py_sitedir}/samba/tests/dcerpc/*.py[co]
 %dir %{py_sitedir}/samba/web_server
 %{py_sitedir}/samba/web_server/*.py[co]
+# TODO
+%attr(755,root,root) %{py_sitedir}/ntdb.so
 %if %{without system_libs}
-%attr(755,root,root) %{py_sitedir}/*.so
+%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]
 %endif
 
-%files -n python-samba3
-%defattr(644,root,root,755)
-%dir %{py_sitedir}/samba
-%dir %{py_sitedir}/samba/samba3
-%attr(755,root,root) %{py_sitedir}/samba/samba3/*.so
-%{py_sitedir}/samba/samba3/*.py[co]
-
 %files test
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gentest
@@ -1588,18 +1511,8 @@ fi
 %{_includedir}/samba-4.0/torture.h
 %{_pkgconfigdir}/torture.pc
 
-%files pidl
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/pidl
-%{_mandir}/man1/pidl.1*
-%{_mandir}/man3/Parse::Pidl*.3*
-%{perl_vendorlib}/Parse/Pidl*
-
 %files -n samba3
 %defattr(644,root,root,755)
-%attr(754,root,root) /etc/rc.d/init.d/smb
-%{systemdunitdir}/nmb.service
-%{systemdunitdir}/smb.service
 %attr(755,root,root) %{_bindir}/dbwrap_tool
 %attr(755,root,root) %{_bindir}/smbcontrol
 %attr(755,root,root) %{_bindir}/smbpasswd
@@ -1608,38 +1521,18 @@ fi
 %attr(755,root,root) %{_sbindir}/mksmbpasswd.sh
 %attr(755,root,root) %{_sbindir}/nmbd
 %attr(755,root,root) %{_sbindir}/smbd
-%attr(755,root,root) %{_libdir}/libnetapi.so.0
-%attr(755,root,root) %{_libdir}/libpdb.so.0
-%attr(755,root,root) %{_libdir}/libsmbldap.so.0
-%attr(755,root,root) %{_libdir}/samba/libads.so
-%attr(755,root,root) %{_libdir}/samba/libauth.so
-%attr(755,root,root) %{_libdir}/samba/libcli_spoolss.so
-%attr(755,root,root) %{_libdir}/samba/libgpo.so
-%attr(755,root,root) %{_libdir}/samba/libidmap.so
-%attr(755,root,root) %{_libdir}/samba/liblibcli_netlogon3.so
-%attr(755,root,root) %{_libdir}/samba/libnet_keytab.so
-%attr(755,root,root) %{_libdir}/samba/libnss_info.so
-%attr(755,root,root) %{_libdir}/samba/libpopt_samba3.so
-%attr(755,root,root) %{_libdir}/samba/libprinting_migrate.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/libsmbldaphelper.so
-%attr(755,root,root) %{_libdir}/samba/libsmbsharemodes.so.0
-%attr(755,root,root) %{_libdir}/samba/libtrusts_util.so
-%attr(755,root,root) %{_libdir}/samba/libxattr_tdb.so
-%attr(755,root,root) %{_libdir}/samba/libtdb_compat.so
 %attr(755,root,root) %{_libdir}/samba/auth/samba4.so
 %attr(755,root,root) %{_libdir}/samba/auth/unix.so
 %attr(755,root,root) %{_libdir}/samba/auth/wbc.so
+%attr(755,root,root) %{_libdir}/samba/libsmbsharemodes.so.0
 %dir %{_libdir}/samba/idmap
 %attr(755,root,root) %{_libdir}/samba/idmap/ad.so
 %attr(755,root,root) %{_libdir}/samba/idmap/autorid.so
 %attr(755,root,root) %{_libdir}/samba/idmap/hash.so
+%attr(755,root,root) %{_libdir}/samba/idmap/rfc2307.so
 %attr(755,root,root) %{_libdir}/samba/idmap/rid.so
 %attr(755,root,root) %{_libdir}/samba/idmap/tdb2.so
-%dir %{_libdir}/samba/vfs
 %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_posix.so
@@ -1647,10 +1540,8 @@ fi
 %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/dirsort.so
-%attr(755,root,root) %{_libdir}/samba/vfs/fileid.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/posix_eadb.so
 %attr(755,root,root) %{_libdir}/samba/vfs/preopen.so
 %attr(755,root,root) %{_libdir}/samba/vfs/shadow_copy2.so
 %attr(755,root,root) %{_libdir}/samba/vfs/smb_traffic_analyzer.so
@@ -1658,9 +1549,8 @@ 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/xattr_tdb.so
 %dir %{_libdir}/samba/pdb
-%attr(755,root,root) %{_libdir}/samba/pdb/ldap.so
+%attr(755,root,root) %{_libdir}/samba/pdb/ldapsam.so
 %attr(755,root,root) %{_libdir}/samba/pdb/smbpasswd.so
 %attr(755,root,root) %{_libdir}/samba/pdb/tdbsam.so
 %attr(755,root,root) %{_libdir}/samba/pdb/wbc_sam.so
@@ -1678,6 +1568,7 @@ fi
 %{_mandir}/man8/idmap_hash.8*
 %{_mandir}/man8/idmap_ldap.8*
 %{_mandir}/man8/idmap_nss.8*
+%{_mandir}/man8/idmap_rfc2307.8*
 %{_mandir}/man8/idmap_rid.8*
 %{_mandir}/man8/idmap_tdb2.8*
 %{_mandir}/man8/idmap_tdb.8*
@@ -1686,22 +1577,50 @@ fi
 %{_mandir}/man8/smbpasswd.8*
 %{_mandir}/man8/smbta-util.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_commit.8*
 %{_mandir}/man8/vfs_crossrename.8*
 %{_mandir}/man8/vfs_dirsort.8*
-%{_mandir}/man8/vfs_fileid.8*
+%{_mandir}/man8/vfs_linux_xfs_sgid.8*
 %{_mandir}/man8/vfs_media_harmony.8*
 %{_mandir}/man8/vfs_preopen.8*
 %{_mandir}/man8/vfs_shadow_copy2.8*
 %{_mandir}/man8/vfs_smb_traffic_analyzer.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_xattr_tdb.8*
+
+%files -n samba3-server
+%defattr(644,root,root,755)
+%attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/smb.conf
+%attr(754,root,root) /etc/rc.d/init.d/smb
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/samba3
+%{systemdunitdir}/nmb.service
+%{systemdunitdir}/smb.service
+
+%files -n samba3-client
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/net
+%attr(755,root,root) %{_bindir}/nmblookup
+%attr(755,root,root) %{_bindir}/rpcclient
+%attr(755,root,root) %{_bindir}/sharesec
+%attr(755,root,root) %{_bindir}/smbcacls
+%attr(755,root,root) %{_bindir}/smbclient
+%attr(755,root,root) %{_bindir}/smbtar
+%attr(755,root,root) %{_bindir}/smbtree
+%attr(755,root,root) %{_libdir}/samba/libgpo.so
+%attr(755,root,root) %{_libdir}/samba/libnet_keytab.so
+%{_mandir}/man1/nmblookup.1*
+%{_mandir}/man1/rpcclient.1*
+%{_mandir}/man1/sharesec.1*
+%{_mandir}/man1/smbcacls.1*
+%{_mandir}/man1/smbclient.1*
+%{_mandir}/man1/smbtar.1*
+%{_mandir}/man1/smbtree.1*
+%{_mandir}/man8/net.8*
 
 %files -n samba3-common
 %defattr(644,root,root,755)
@@ -1712,6 +1631,11 @@ fi
 %attr(755,root,root) %{_bindir}/smbcquotas
 %attr(755,root,root) %{_bindir}/testparm
 %attr(755,root,root) %{_bindir}/vfstest
+%attr(755,root,root) %{_libdir}/samba/libsmbldaphelper.so
+%attr(755,root,root) %{_libdir}/samba/libnss_info.so
+%attr(755,root,root) %{_libdir}/samba/libidmap.so
+%attr(755,root,root) %{_libdir}/samba/libtrusts_util.so
+%attr(755,root,root) %{_libdir}/samba/libpopt_samba3.so
 %dir %{_libdir}/samba/auth
 %attr(755,root,root) %{_libdir}/samba/auth/script.so
 %{_mandir}/man1/ntlm_auth.1*
@@ -1722,36 +1646,19 @@ fi
 %{_mandir}/man8/eventlogadm.8*
 %{_mandir}/man8/pdbedit.8*
 
-%files -n samba3-client
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/net
-%attr(755,root,root) %{_bindir}/nmblookup
-%attr(755,root,root) %{_bindir}/rpcclient
-%attr(755,root,root) %{_bindir}/sharesec
-%attr(755,root,root) %{_bindir}/smbcacls
-%attr(755,root,root) %{_bindir}/smbclient
-%attr(755,root,root) %{_bindir}/smbtree
-%{_mandir}/man8/net.8*
-%{_mandir}/man1/nmblookup.1*
-%{_mandir}/man1/rpcclient.1*
-%{_mandir}/man1/sharesec.1*
-%{_mandir}/man1/smbcacls.1*
-%{_mandir}/man1/smbclient.1*
-%{_mandir}/man1/smbtree.1*
-
 %files -n samba3-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnetapi.so
 %attr(755,root,root) %{_libdir}/libpdb.so
 %attr(755,root,root) %{_libdir}/libsmbldap.so
-%{_includedir}/samba-4.0/netapi.h
-%{_includedir}/samba-4.0/smbconf.h
-%{_includedir}/samba-4.0/smb_share_modes.h
-%{_includedir}/samba-4.0/machine_sid.h
 %{_includedir}/samba-4.0/lookup_sid.h
+%{_includedir}/samba-4.0/machine_sid.h
+%{_includedir}/samba-4.0/netapi.h
 %{_includedir}/samba-4.0/passdb.h
+%{_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
 %{_pkgconfigdir}/netapi.pc
 
 %files -n samba3-vfs-audit
@@ -1768,6 +1675,11 @@ fi
 %attr(755,root,root) %{_libdir}/samba/vfs/cap.so
 %{_mandir}/man8/vfs_cap.8*
 
+%files -n samba3-vfs-catia
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/samba/vfs/catia.so
+%{_mandir}/man8/vfs_catia.8*
+
 %files -n samba3-vfs-default_quota
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/samba/vfs/default_quota.so
@@ -1807,80 +1719,56 @@ fi
 %attr(755,root,root) %{_libdir}/samba/vfs/recycle.so
 %{_mandir}/man8/vfs_recycle.8*
 
-%files -n samba3-vfs-shadow_copy
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/samba/vfs/shadow_copy.so
-%{_mandir}/man8/vfs_shadow_copy.8*
-
-%files -n samba3-vfs-catia
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/samba/vfs/catia.so
-%{_mandir}/man8/vfs_catia.8*
-
 %files -n samba3-vfs-scannedonly
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/samba/vfs/scannedonly.so
 %{_mandir}/man8/vfs_scannedonly.8*
 
-%files -n samba3-smbget
+%files -n samba3-vfs-shadow_copy
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/samba/vfs/shadow_copy.so
+%{_mandir}/man8/vfs_shadow_copy.8*
+
+%files -n smbget3
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/smbget
 %{_mandir}/man1/smbget.1*
 %{_mandir}/man5/smbgetrc.5*
 
 %if %{with cups}
-%files -n cups-backend-samba3-smb
+%files -n cups-backend-smb3
 %defattr(644,root,root,755)
 %attr(755,root,root) %{cups_serverbin}/backend/smb
 %attr(755,root,root) %{_bindir}/smbspool
 %{_mandir}/man8/smbspool.8*
 %endif
 
-%files -n samba3-swat
+%files -n samba3-winbind
+%attr(755,root,root) %{_sbindir}/winbindd
+%attr(754,root,root) /etc/rc.d/init.d/winbind
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/winbind
+%{systemdunitdir}/winbind.service
+%{_mandir}/man8/winbindd*.8*
+
+%files -n nss_wins3
 %defattr(644,root,root,755)
-#%doc swat/README* swat/help/*
-%doc swat/help/*
-%attr(755,root,root) %{_sbindir}/swat
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/swat
-%dir %{_datadir}/samba/swat
-%{_datadir}/samba/swat/help
-%{_datadir}/samba/swat/images
-%{_datadir}/samba/swat/include
-%dir %{_datadir}/samba/swat/lang
-%lang(ja) %{_datadir}/samba/swat/lang/ja
-%lang(ru) %{_datadir}/samba/swat/lang/ru
-%lang(tr) %{_datadir}/samba/swat/lang/tr
-%{_mandir}/man8/swat.8*
-%lang(de) %{_datadir}/samba/codepages/de.msg
-%{_datadir}/samba/codepages/en.msg
-%lang(fi) %{_datadir}/samba/codepages/fi.msg
-%lang(fr) %{_datadir}/samba/codepages/fr.msg
-%lang(it) %{_datadir}/samba/codepages/it.msg
-%lang(ja) %{_datadir}/samba/codepages/ja.msg
-%lang(nl) %{_datadir}/samba/codepages/nl.msg
-%lang(pl) %{_datadir}/samba/codepages/pl.msg
-%lang(ru) %{_datadir}/samba/codepages/ru*
-%lang(tr) %{_datadir}/samba/codepages/tr.msg
-
-%files todo
+%attr(755,root,root) /%{_lib}/libnss_wins*
+
+%files -n samba3-libsmbclient
 %defattr(644,root,root,755)
-%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/samba/smbusers
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/samba
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/samba
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/samba
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.samba
+%attr(755,root,root) %{_libdir}/libsmbclient.so.*
+%attr(755,root,root) %{_libdir}/libwbclient.so.*
+%{_mandir}/man7/libsmbclient.7*
 
-%dir %{_sambahome}
-%dir /var/lib/samba
-%ghost /var/lib/samba/*.dat
-%dir /var/lib/samba/printing
+%files -n samba3-libsmbclient-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libsmbclient.so
+%attr(755,root,root) %{_libdir}/libwbclient.so
+%{_includedir}/libsmbclient.h
+%{_includedir}/wbclient.h
 
-%attr(750,root,root) %dir /var/log/samba
-%attr(750,root,root) %dir /var/log/samba/cores
-%attr(750,root,root) %dir /var/log/samba/cores/smbd
-%attr(750,root,root) %dir /var/log/samba/cores/nmbd
-%attr(750,root,root) %dir /var/log/archive/samba
-%attr(1777,root,root) %dir /var/spool/samba
 %if %{with ldap}
-%doc examples/LDAP
+%files -n openldap-schema-samba3
+%defattr(644,root,root,755)
+%{schemadir}/samba.schema
 %endif