%bcond_without cups # CUPS support
%bcond_without ldap # LDAP support
%bcond_without avahi # Avahi support
+%bcond_without dmapi # DMAPI support
%bcond_without systemd # systemd integration
-%bcond_with system_heimdal # Use system Heimdal libraries (broken in samba 4.4.x)
+%bcond_with system_heimdal # Use system Heimdal libraries [was broken in samba 4.4.x + heimdal 1.5.x]
%bcond_without system_libs # system libraries (talloc,tdb,tevent,ldb,ntdb)
+%bcond_without ctdb_pcp # Performance Co-Pilot support for CTDB
# turn on when https://bugzilla.samba.org/show_bug.cgi?id=11764 is fixed
%bcond_with replace
%if %{with system_libs}
-%define ldb_ver 1.1.26
+%define ldb_ver 1.1.27
%define ntdb_ver 1.0
-%define talloc_ver 2:2.1.6
-%define tdb_ver 2:1.3.9
-%define tevent_ver 0.9.28
+%define talloc_ver 2:2.1.8
+%define tdb_ver 2:1.3.10
+%define tevent_ver 0.9.29
+%endif
+
+# dmapi-devel forces largefile/64bit stuff that isn't detected properly
+# -- what is the exact problem? samba 4.5.6 builds with DMAPI on i686
+%ifarch %{ix86}
+%undefine with_dmapi
%endif
%include /usr/lib/rpm/macros.perl
Summary: Samba Active Directory and SMB server
Summary(pl.UTF-8): Serwer Samba Active Directory i SMB
Name: samba
-Version: 4.5.1
-Release: 2
+Version: 4.5.6
+Release: 1
Epoch: 1
License: GPL v3
Group: Networking/Daemons
Source0: https://www.samba.org/ftp/samba/samba-%{version}.tar.gz
-# Source0-md5: f7a246f9deeaaf8e827d584e1924916d
+# Source0-md5: 7ee18b7f5266e469df43756685009ce3
Source1: smb.init
Source2: samba.pamd
Source4: samba.sysconfig
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
+%{?with_dmapi:BuildRequires: dmapi-devel}
BuildRequires: docbook-style-xsl
# just FAM API
BuildRequires: gamin-devel
BuildRequires: nss_wrapper >= 1.0.2
%{?with_ldap:BuildRequires: openldap-devel >= 2.3.0}
BuildRequires: pam-devel >= 0.99.8.1
+%{?with_ctdb_pcp:BuildRequires: pcp-devel}
BuildRequires: perl-ExtUtils-MakeMaker
BuildRequires: perl-Parse-Yapp >= 1.05
BuildRequires: pkgconfig
%if %{with system_libs}
BuildRequires: ldb-devel >= %{ldb_ver}
BuildRequires: ntdb-devel >= %{ntdb_ver}
-BuildRequires: python-ntdb >= %{ntdb_ver}
BuildRequires: python-ldb-devel >= %{ldb_ver}
+BuildRequires: python-ntdb >= %{ntdb_ver}
BuildRequires: python-talloc-devel >= %{talloc_ver}
BuildRequires: python-tevent >= %{tevent_ver}
BuildRequires: talloc-devel >= %{talloc_ver}
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
+Requires: python-samba = %{epoch}:%{version}-%{release}
Requires: rc-scripts >= 0.4.0.12
Requires: setup >= 2.4.6-7
Requires: systemd-units >= 38
Obsoletes: samba-doc-html
Obsoletes: samba-doc-pdf
Obsoletes: samba-pdb-xml
-Obsoletes: samba-vfs-block
Obsoletes: samba-vfs-audit
+Obsoletes: samba-vfs-block
Obsoletes: samba-vfs-cap
Obsoletes: samba-vfs-catia
Obsoletes: samba-vfs-default_quota
Obsoletes: samba-vfs-expand_msdfs
Obsoletes: samba-vfs-fake_perms
Obsoletes: samba-vfs-netatalk
-Obsoletes: samba-vfs-recycle
Obsoletes: samba-vfs-readahead
Obsoletes: samba-vfs-readonly
+Obsoletes: samba-vfs-recycle
Obsoletes: samba-vfs-scannedonly
Obsoletes: samba-vfs-shadow_copy
Obsoletes: samba3
Obsoletes: samba3-vfs-expand_msdfs
Obsoletes: samba3-vfs-fake_perms
Obsoletes: samba3-vfs-netatalk
-Obsoletes: samba3-vfs-recycle
Obsoletes: samba3-vfs-readahead
Obsoletes: samba3-vfs-readonly
+Obsoletes: samba3-vfs-recycle
Obsoletes: samba3-vfs-scannedonly
Obsoletes: samba3-vfs-shadow_copy
Obsoletes: samba4
%description vfs-ceph
VFS module to host shares on Ceph file system.
-This module only works with the libceph.so user-space client. It is
+This module only works with the libceph.so user-space client. It is
not needed if you are using the kernel client or the FUSE client.
%description vfs-ceph -l pl.UTF-8
Group: Applications/Networking
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: libsmbclient = %{epoch}:%{version}-%{release}
%{?with_system_heimdal:Requires: heimdal-libs >= 1.5.3-1}
+Requires: libsmbclient = %{epoch}:%{version}-%{release}
Suggests: cifs-utils
Obsoletes: samba3-client
Obsoletes: samba4-client
Requires: systemd-units >= 38
Obsoletes: samba3-winbind
Obsoletes: samba4-winbind
+# pam_winbind is not complete replacement, but pam_smbpass has been removed (in samba 4.4)
+#Obsoletes: pam-pam_smbpass
%description winbind
Provides the winbind daemon and testing tools to allow authentication
Requires: tdb >= %{tdb_ver}
Requires: tevent >= %{tevent_ver}
%endif
+Obsoletes: samba-vfs-notify_fam
%description libs
Samba shared libraries.
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: %{name}-winbind = %{epoch}:%{version}-%{release}
Obsoletes: samba4-test
+Obsoletes: samba4-test-devel
+Obsoletes: samba-test-devel
%description test
samba-test provides testing tools for both the server and client
%description test -l pl.UTF-8
Narzędzia testowe dla serwerów i klientów Samby.
-%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}
-Obsoletes: samba4-test-devel
-
-%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.
-
-%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.
-
%package -n libsmbclient
Summary: libsmbclient and libwbclient - Samba client libraries
Summary(pl.UTF-8): libsmbclient i libwbclient - biblioteki klienckie Samby
Ten pakiet zawiera schemat Samby (samba.schema) dla OpenLDAP-a.
%package -n ctdb
-Summary: A Clustered Database based on Samba's Trivial Database (TDB)
-Group: System Environment/Daemons
-Requires: %{name}-client-libs = %{samba_depver}
-Requires: coreutils
-Requires: fileutils
+Summary: A Clustered Database based on Samba's Trivial Database (TDB)
+Summary(pl.UTF-8): Klastrowa baza danych oparta na bazie danych Trivial Database z Samby (TDB)
+Group: Daemons
+URL: http://ctdb.samba.org/
+Requires(post,preun,postun): systemd-units
+Requires(post): /usr/bin/systemd-tmpfiles
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: coreutils
+Requires: fileutils
# for ps and killall
-Requires: psmisc
-Requires: sed
-Requires: tdb-tools
-Requires: gawk
+Requires: gawk
+Requires: psmisc
+Requires: sed
+%if %{with system_libs}
+Requires: tdb >= %{tdb_ver}
+%endif
# for pkill and pidof:
-Requires: procps
+Requires: procps
# for netstat:
-Requires: net-tools
-Requires: ethtool
+Requires: ethtool
+Requires: net-tools
# for ip:
-Requires: iproute
-Requires: iptables
+Requires: iproute2
+Requires: iptables
# for flock, getopt, kill:
-Requires: util-linux
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires: util-linux
%description -n ctdb
-CTDB is a cluster implementation of the TDB database used by Samba and other
-projects to store temporary data. If an application is already using TDB for
-temporary data it is very easy to convert that application to be cluster aware
-and use CTDB instead.
+CTDB is a cluster implementation of the TDB database used by Samba and
+other projects to store temporary data. If an application is already
+using TDB for temporary data it is very easy to convert that
+application to be cluster aware and use CTDB instead.
+
+%description -l pl.UTF-8
+CTDB to klastrowa implementacja bazy danych TDB używanej w Sambie oraz
+innych projektach do przechowywania danych tymczasowych. Jeśli jakaś
+aplikacja już wykorzystuje TDB do trzymania danych tymczasowych,
+bardzo przerobić ją na klastrowalną, wykorzystującą CTDB.
+
+%package -n pcp-ctdb
+Summary: CTDB PMDA
+Summary(pl.UTF-8): PMDA CTDB
+Group: Applications/System
+Requires: ctdb = %{epoch}:%{version}-%{release}
+Requires: pcp
+
+%description -n pcp-ctdb
+This PMDA extracts metrics from the locally running ctdbd daemon for
+export to PMCD.
+
+%description -n pcp-ctdb -l pl.UTF-8
+Ten PMDA odczytuje pomiary z lokalnie działającego demona ctdbd w celu
+wyeksportowania do PMCD.
%prep
-%setup -q -n samba-%{version}
+%setup -q
%{?with_system_heimdal:%patch0 -p1}
%patch1 -p1
%patch2 -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
+%if %{with system_heimdal}
+%{__mv} source4/heimdal_build/krb5-types{,-smb}.h
+%endif
+
%build
LDFLAGS="${LDFLAGS:-%rpmldflags}" \
CFLAGS="${CFLAGS:-%rpmcflags}" \
--with-cluster-support \
--with-acl-support \
--with%{!?with_ads:out}-ads \
+ %{?with_ctdb_pcp:--enable-pmda} \
--with-automount \
- --with-dmapi \
+ --with%{!?with_dmapi:out}-dmapi \
--with-dnsupdate \
--with-iconv \
--with%{!?with_ldap:out}-ldap \
:> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/ctdb
-install packaging/systemd/samba.conf.tmp $RPM_BUILD_ROOT%{systemdtmpfilesdir}/samba.conf
+cp -p packaging/systemd/samba.conf.tmp $RPM_BUILD_ROOT%{systemdtmpfilesdir}/samba.conf
echo "d /var/run/ctdb 755 root root" > $RPM_BUILD_ROOT%{systemdtmpfilesdir}/ctdb.conf
-install packaging/systemd/nmb.service $RPM_BUILD_ROOT%{systemdunitdir}
-install packaging/systemd/samba.service $RPM_BUILD_ROOT%{systemdunitdir}
-install packaging/systemd/smb.service $RPM_BUILD_ROOT%{systemdunitdir}
-install packaging/systemd/winbind.service $RPM_BUILD_ROOT%{systemdunitdir}
-install ctdb/config/ctdb.service $RPM_BUILD_ROOT%{systemdunitdir}
+cp -p packaging/systemd/nmb.service $RPM_BUILD_ROOT%{systemdunitdir}
+cp -p packaging/systemd/samba.service $RPM_BUILD_ROOT%{systemdunitdir}
+cp -p packaging/systemd/smb.service $RPM_BUILD_ROOT%{systemdunitdir}
+cp -p packaging/systemd/winbind.service $RPM_BUILD_ROOT%{systemdunitdir}
+cp -p ctdb/config/ctdb.service $RPM_BUILD_ROOT%{systemdunitdir}
install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/smb
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/samba
> $RPM_BUILD_ROOT/etc/security/blacklist.samba
%if %{with ldap}
-install examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir}
+cp -p examples/LDAP/samba.schema $RPM_BUILD_ROOT%{schemadir}
%endif
# remove man pages for not installed commands
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_prealloc.8*
%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/vfs_tsmsm.8*
+# remove tests
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/ctdb*_tests
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/ctdb/tests
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/ctdb/tests
+
%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
%py_comp $RPM_BUILD_ROOT%{py_sitedir}
%py_postclean
%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
+%attr(755,root,root) %{_libdir}/samba/bind9/dlz_bind9_11.so
%dir %{_libdir}/samba/gensec
%attr(755,root,root) %{_libdir}/samba/gensec/krb5.so
+%if %{with system_heimdal}
+%dir %{_libdir}/samba/hdb
+%attr(755,root,root) %{_libdir}/samba/hdb/hdb_samba4.so
+%endif
%dir %{_libdir}/samba/ldb
%attr(755,root,root) %{_libdir}/samba/ldb/aclread.so
%attr(755,root,root) %{_libdir}/samba/ldb/acl.so
%{_mandir}/man8/idmap_nss.8*
%{_mandir}/man8/idmap_rfc2307.8*
%{_mandir}/man8/idmap_rid.8*
+%{_mandir}/man8/idmap_script.8*
%{_mandir}/man8/idmap_tdb2.8*
%{_mandir}/man8/idmap_tdb.8*
%{_mandir}/man8/pam_winbind.8*
%dir %{_libdir}/samba
%if %{without replace}
-%attr(755,root,root) %{_libdir}/samba/libgenrand-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libgensec-samba4.so
-%attr(755,root,root) %ghost %{_libdir}/samba/libheimntlm-samba4.so.1
-%attr(755,root,root) %{_libdir}/samba/libheimntlm-samba4.so.1.0.1
-%attr(755,root,root) %{_libdir}/samba/libiov-buf-samba4.so
-%attr(755,root,root) %ghost %{_libdir}/samba/libkdc-samba4.so.2
-%attr(755,root,root) %{_libdir}/samba/libkdc-samba4.so.2.0.0
-%attr(755,root,root) %{_libdir}/samba/libregistry-samba4.so
%attr(755,root,root) %{_libdir}/samba/libreplace-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libserver-id-db-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libsmbclient-raw-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libsys-rw-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libtalloc-report-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libtime-basic-samba4.so
-%attr(755,root,root) %{_libdir}/samba/libtorture-samba4.so
+%endif
+%if %{without system_heimdal}
%attr(755,root,root) %ghost %{_libdir}/samba/libasn1-samba4.so.8
%attr(755,root,root) %{_libdir}/samba/libasn1-samba4.so.8.0.0
%attr(755,root,root) %ghost %{_libdir}/samba/libcom_err-samba4.so.0
%attr(755,root,root) %{_libdir}/samba/libhdb-samba4.so.11.0.2
%attr(755,root,root) %ghost %{_libdir}/samba/libheimbase-samba4.so.1
%attr(755,root,root) %{_libdir}/samba/libheimbase-samba4.so.1.0.0
+%attr(755,root,root) %ghost %{_libdir}/samba/libheimntlm-samba4.so.1
+%attr(755,root,root) %{_libdir}/samba/libheimntlm-samba4.so.1.0.1
%attr(755,root,root) %ghost %{_libdir}/samba/libhx509-samba4.so.5
%attr(755,root,root) %{_libdir}/samba/libhx509-samba4.so.5.0.0
+%attr(755,root,root) %ghost %{_libdir}/samba/libkdc-samba4.so.2
+%attr(755,root,root) %{_libdir}/samba/libkdc-samba4.so.2.0.0
%attr(755,root,root) %ghost %{_libdir}/samba/libkrb5-samba4.so.26
%attr(755,root,root) %{_libdir}/samba/libkrb5-samba4.so.26.0.0
%attr(755,root,root) %ghost %{_libdir}/samba/libroken-samba4.so.19
%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-sam-reply-samba4.so
%attr(755,root,root) %{_libdir}/samba/libauth-unix-token-samba4.so
%attr(755,root,root) %{_libdir}/samba/libCHARSET3-samba4.so
%attr(755,root,root) %{_libdir}/samba/libcliauth-samba4.so
%attr(755,root,root) %{_libdir}/samba/libdsdb-module-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/libgenrand-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libgensec-samba4.so
%attr(755,root,root) %{_libdir}/samba/libgpo-samba4.so
%attr(755,root,root) %{_libdir}/samba/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/libiov-buf-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/libmessages-dgm-samba4.so
%attr(755,root,root) %{_libdir}/samba/libmessages-util-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libMESSAGING-samba4.so
%attr(755,root,root) %{_libdir}/samba/libmsghdr-samba4.so
%attr(755,root,root) %{_libdir}/samba/libmsrpc3-samba4.so
%attr(755,root,root) %{_libdir}/samba/libndr-samba4.so
%attr(755,root,root) %{_libdir}/samba/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/libregistry-samba4.so
%attr(755,root,root) %{_libdir}/samba/libsamba3-util-samba4.so
%attr(755,root,root) %{_libdir}/samba/libsamba-debug-samba4.so
%attr(755,root,root) %{_libdir}/samba/libsamba-modules-samba4.so
%attr(755,root,root) %{_libdir}/samba/libsamba-net-samba4.so
%attr(755,root,root) %{_libdir}/samba/libsamba-python-samba4.so
%attr(755,root,root) %{_libdir}/samba/libsamba-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-id-db-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/libsmbclient-raw-samba4.so
%attr(755,root,root) %{_libdir}/samba/libsmbd-base-samba4.so
%attr(755,root,root) %{_libdir}/samba/libsmbd-conn-samba4.so
%attr(755,root,root) %{_libdir}/samba/libsmbd-shim-samba4.so
%attr(755,root,root) %{_libdir}/samba/libsmbpasswdparser-samba4.so
%attr(755,root,root) %{_libdir}/samba/libsmbregistry-samba4.so
%attr(755,root,root) %{_libdir}/samba/libsmb-transport-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libsocket-blocking-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libsys-rw-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libtalloc-report-samba4.so
%attr(755,root,root) %{_libdir}/samba/libtdb-wrap-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libtime-basic-samba4.so
%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-reg-samba4.so
%attr(755,root,root) %{_libdir}/libndr-standard.so
%attr(755,root,root) %{_libdir}/libnetapi.so
%attr(755,root,root) %{_libdir}/libsamba-credentials.so
+%attr(755,root,root) %{_libdir}/libsamba-errors.so
%attr(755,root,root) %{_libdir}/libsamba-hostconfig.so
%attr(755,root,root) %{_libdir}/libsamba-passdb.so
%attr(755,root,root) %{_libdir}/libsamba-policy.so
%{py_sitedir}/samba/tests/*.py[co]
%dir %{py_sitedir}/samba/tests/blackbox
%{py_sitedir}/samba/tests/blackbox/*.py[co]
-%dir %{py_sitedir}/samba/tests/samba_tool
-%{py_sitedir}/samba/tests/samba_tool/*.py[co]
%dir %{py_sitedir}/samba/tests/dcerpc
%{py_sitedir}/samba/tests/dcerpc/*.py[co]
+%dir %{py_sitedir}/samba/tests/dns_forwarder_helpers
+%{py_sitedir}/samba/tests/dns_forwarder_helpers/*.py[co]
+%dir %{py_sitedir}/samba/tests/kcc
+%{py_sitedir}/samba/tests/kcc/*.py[co]
+%dir %{py_sitedir}/samba/tests/samba_tool
+%{py_sitedir}/samba/tests/samba_tool/*.py[co]
%dir %{py_sitedir}/samba/third_party
%{py_sitedir}/samba/third_party/*.py[co]
%dir %{py_sitedir}/samba/third_party/iso8601
%attr(755,root,root) %{_bindir}/ndrdump
%attr(755,root,root) %{_bindir}/smbtorture
%attr(755,root,root) %{_libdir}/samba/libdlz-bind9-for-torture-samba4.so
+%attr(755,root,root) %{_libdir}/samba/libtorture-samba4.so
%{_mandir}/man1/gentest.1*
%{_mandir}/man1/locktest.1*
%{_mandir}/man1/masktest.1*
%endif
%files -n ctdb
-%defattr(-,root,root)
+%defattr(644,root,root,755)
%doc ctdb/README
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysconfig/ctdb
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ctdb
%{_sysconfdir}/ctdb/notify.sh
%{_sysconfdir}/ctdb/debug-hung-script.sh
%{_sysconfdir}/ctdb/ctdb-crash-cleanup.sh
%{_sysconfdir}/ctdb/gcore_trace.sh
%{_sysconfdir}/ctdb/functions
%{_sysconfdir}/ctdb/debug_locks.sh
-%dir %{_localstatedir}/lib/ctdb/
+%dir %{_localstatedir}/lib/ctdb
%{systemdunitdir}/ctdb.service
%dir %{_sysconfdir}/ctdb/notify.d
%{_sysconfdir}/ctdb/notify.d/README
%{systemdtmpfilesdir}/ctdb.conf
-%{_sbindir}/ctdbd
-%{_sbindir}/ctdbd_wrapper
-%{_bindir}/ctdb
-%{_libexecdir}/ctdb/ctdb_natgw
-%{_libexecdir}/ctdb/ctdb_recovery_helper
-%{_libexecdir}/ctdb/smnotify
-%{_bindir}/ping_pong
-%{_bindir}/ltdbtool
-%{_bindir}/ctdb_diagnostics
-%{_bindir}/onnode
-%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_event_helper
-%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_killtcp
-%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_lock_helper
-%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_lvs
-%attr(755,root,root) %{_libexecdir}/ctdb/ctdb_mutex_fcntl_helper
+%attr(755,root,root) %{_sbindir}/ctdbd
+%attr(755,root,root) %{_sbindir}/ctdbd_wrapper
+%attr(755,root,root) %{_bindir}/ctdb
+%attr(755,root,root) %{_bindir}/ping_pong
+%attr(755,root,root) %{_bindir}/ltdbtool
+%attr(755,root,root) %{_bindir}/ctdb_diagnostics
+%attr(755,root,root) %{_bindir}/onnode
+%dir %{_libdir}/ctdb
+%{_libdir}/ctdb/ctdb_natgw
+%{_libdir}/ctdb/ctdb_recovery_helper
+%{_libdir}/ctdb/smnotify
+%attr(755,root,root) %{_libdir}/ctdb/ctdb_event_helper
+%attr(755,root,root) %{_libdir}/ctdb/ctdb_killtcp
+%attr(755,root,root) %{_libdir}/ctdb/ctdb_lock_helper
+%attr(755,root,root) %{_libdir}/ctdb/ctdb_lvs
+%attr(755,root,root) %{_libdir}/ctdb/ctdb_mutex_fcntl_helper
%{_mandir}/man1/ctdb.1*
%{_mandir}/man1/ctdb_diagnostics.1*
%{_mandir}/man7/ctdb.7*
%{_mandir}/man7/ctdb-tunables.7*
%{_mandir}/man7/ctdb-statistics.7*
+
+%if %{with ctdb_pcp}
+%files -n pcp-ctdb
+%defattr(644,root,root,755)
+%dir /var/lib/pcp/pmdas/ctdb
+%doc /var/lib/pcp/pmdas/ctdb/README
+%attr(755,root,root) /var/lib/pcp/pmdas/ctdb/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/ctdb/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/ctdb/pmdactdb
+/var/lib/pcp/pmdas/ctdb/domain.h
+/var/lib/pcp/pmdas/ctdb/help
+/var/lib/pcp/pmdas/ctdb/pmns
+%endif