Fix ldb configure and library cleanup.

2 files changed, 211 insertions, 206 deletions

diff --git a/samba4-ldb-configure.patch b/samba4-ldb-configure.patch
deleted file mode 100644
index 60c92b5..0000000
--- a/samba4-ldb-configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: samba-4.0.0/lib/ldb/wscript
-===================================================================
---- samba-4.0.0.orig/lib/ldb/wscript
-+++ samba-4.0.0/lib/ldb/wscript
-@@ -29,11 +29,10 @@ def set_options(opt):
-     opt.tool_options('python') # options for disabling pyc or pyo compilation
- 
- def configure(conf):
--    conf.RECURSE('lib/tdb_compat')
-+    conf.RECURSE('lib/tdb')
-     conf.RECURSE('lib/tevent')
-     conf.RECURSE('lib/popt')
-     conf.RECURSE('lib/replace')
--    conf.RECURSE('lib/tdb_compat')
-     conf.find_program('python', var='PYTHON')
-     conf.find_program('xsltproc', var='XSLTPROC')
-     conf.check_tool('python')
diff --git a/samba4.spec b/samba4.spec
index 188b2ae..2a6a4d0 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -45,7 +45,6 @@ Source6: samba.pamd
 #Source7: smbprint
 
 Patch1: samba4-libpdb-soversion.patch
-Patch2: samba4-ldb-configure.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -130,6 +129,7 @@ of SMB/CIFS shares and printing to SMB/CIFS printers.
 %package libs
 Summary: Samba libraries
 Group: Applications/System
+Requires: libwbclient
 
 # Remove for Fedora and RHEL
 Obsoletes: samba-4.0-libs
@@ -245,6 +245,7 @@ the local kerberos library to use the same KDC as samba and winbind use
 %package winbind-clients
 Summary: Samba winbind clients
 Group: Applications/System
+Requires: libwbclient
 
 Conflicts: samba-winbind-clients < 1:%{version}
 
@@ -257,17 +258,6 @@ The samba-winbind-clients package provides the NSS library and a PAM
 module necessary to communicate to the Winbind Daemon
 
 
-%package winbind-devel
-Summary: Developer tools for the winbind library
-Group: Development
-Requires: %{name}-winbind = %{version}-%{release}
-
-Conflicts: samba-winbind-devel < 1:%{version}
-Provides: samba-winbind-devel = %{version}-%{release}
-
-%description winbind-devel
-The samba-winbind package provides developer tools for the wbclient library.
-
 %package swat
 Summary: The Samba SMB server Web configuration program
 Group: Applications/System
@@ -297,7 +287,6 @@ Provides: libsmbclient-4.0
 %description -n libsmbclient4
 The libsmbclient4 contains the SMB client library from the Samba suite.
 
-
 %package -n libsmbclient4-devel
 Summary: Developer tools for the SMB client library
 Group: Development
@@ -314,9 +303,25 @@ Provides: libsmbclient-4.0-devel
 The libsmbclient4-devel package contains the header files and libraries needed to
 develop programs that link against the SMB client library in the Samba suite.
 
+%package -n libwbclient
+Summary: The winbind client library
+Group: Applications/System
+
+%description -n libwbclient
+The libwbclient package contains the winbind client library from the Samba suite.
+
+%package -n libwbclient-devel
+Summary: Developer tools for the winbind library
+Group: Development
+Requires: %{name}-winbind = %{version}-%{release}
+
+%description -n libwbclient-devel
+The libwbclient-devel package provides developer tools for the wbclient library.
+
 %package dc
 Summary: Samba AD Domain Controller
 Group: Applications/System
+Requires: samba4-dc-libs = %{version}-%{release}
 
 # Remove for Fedora and RHEL
 Obsoletes: samba-4.0-dc
@@ -325,11 +330,20 @@ Provides: samba-4.0-dc
 %description dc
 The samba-dc package provides AD Domain Controller functionality
 
+%package dc-libs
+Summary: Samba AD Domain Controller Libraries
+Group: Applications/System
+Requires: samba4-libs = %{version}-%{release}
+Requires: samba4-common = %{version}-%{release}
+
+%description dc-libs
+The %{name}-dc-libs package contains the libraries needed by the DC to
+link against the SMB, RPC and other protocols.
+
 %prep
 %setup -q -n samba-%{version}
 
 %patch1 -p1 -b .waf
-%patch2 -p1 -b .ldb
 
 %build
 %define talloc_lib %nil
@@ -362,11 +376,12 @@ The samba-dc package provides AD Domain Controller functionality
         --with-piddir=/var/run \
         --with-sockets-dir=/var/run \
         --with-modulesdir=%{_libdir}/samba \
-	--with-pammodulesdir=/%{_lib}/security \
+        --with-pammodulesdir=/%{_lib}/security \
         --with-lockdir=/var/lib/samba \
+        --disable-tdb2 \
         --disable-gnutls \
         --disable-rpath-install \
-	--with-shared-modules=%{_samba4_modules} \
+        --with-shared-modules=%{_samba4_modules} \
         --builtin-libraries=ccan \
         --bundled-libraries=%{_samba4_libraries} \
 %if ! %with_pam_smbpass
@@ -539,18 +554,10 @@ rm -rf %{buildroot}
 %{_sbindir}/nmbd
 %{_sbindir}/smbd
 %{_mandir}/man8/samba.8.gz
-%{_libdir}/samba/libCHARSET3.so
-%{_libdir}/samba/libadt_tree.so
-%{_libdir}/samba/libnamearray.so
-%{_libdir}/samba/libnet_keytab.so
-%{_libdir}/samba/libpopt_samba3.so
 %{_libdir}/samba/libsmbd_base.so
 %{_libdir}/samba/libsmbd_conn.so
-%{_libdir}/samba/libstring_init.so
-%{_libdir}/samba/libtdb_compat.so
-%{_libdir}/samba/libutil_malloc.so
-%{_libdir}/samba/libutil_sec.so
-%{_libdir}/samba/pdb
+%{_libdir}/samba/auth
+%{_libdir}/samba/idmap
 %{_libdir}/samba/vfs
 %{_unitdir}/nmb.service
 %{_unitdir}/smb.service
@@ -562,6 +569,149 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/openldap/schema
 %{_sysconfdir}/openldap/schema/samba.schema
 
+%files libs
+%defattr(-,root,root)
+%{_libdir}/libdcerpc-atsvc.so.*
+%{_libdir}/libdcerpc-binding.so.*
+%{_libdir}/libdcerpc-samr.so.*
+%{_libdir}/libdcerpc.so.*
+%{_libdir}/libgensec.so.*
+%{_libdir}/libndr-krb5pac.so.*
+%{_libdir}/libndr-nbt.so.*
+%{_libdir}/libndr-standard.so.*
+%{_libdir}/libndr.so.*
+%{_libdir}/libregistry.so.*
+%{_libdir}/libsamba-credentials.so.*
+%{_libdir}/libsamba-hostconfig.so.*
+%{_libdir}/libsamba-policy.so.*
+%{_libdir}/libsamba-util.so.*
+%{_libdir}/libsamdb.so.*
+%{_libdir}/libsmbclient-raw.so.*
+%{_libdir}/libsmbconf.so.*
+%{_libdir}/libtevent-util.so.*
+
+# libraries needed by the public libraries
+%{_libdir}/samba/libCHARSET3.so
+%{_libdir}/samba/libHDB_SAMBA4.so
+%{_libdir}/samba/libLIBWBCLIENT_OLD.so
+%{_libdir}/samba/libUTIL_TDB.so
+%{_libdir}/samba/libadt_tree.so
+%{_libdir}/samba/libasn1-samba4.so.8
+%{_libdir}/samba/libasn1-samba4.so.8.0.0
+%{_libdir}/samba/libasn1util.so
+%{_libdir}/samba/libauth_sam_reply.so
+%{_libdir}/samba/libauth_unix_token.so
+%{_libdir}/samba/libauthkrb5.so
+%{_libdir}/samba/libcli-ldap-common.so
+%{_libdir}/samba/libcli-ldap.so
+%{_libdir}/samba/libcli-nbt.so
+%{_libdir}/samba/libcli_cldap.so
+%{_libdir}/samba/libcli_smb_common.so
+%{_libdir}/samba/libcliauth.so
+%{_libdir}/samba/libcluster.so
+%{_libdir}/samba/libdb-glue.so
+%{_libdir}/samba/libdbwrap.so
+%{_libdir}/samba/libdcerpc-samba.so
+%{_libdir}/samba/libdcerpc-samba4.so
+%{_libdir}/samba/liberrors.so
+%{_libdir}/samba/libevents.so
+%{_libdir}/samba/libflag_mapping.so
+%{_libdir}/samba/libgse.so
+%{_libdir}/samba/libgssapi-samba4.so.2
+%{_libdir}/samba/libgssapi-samba4.so.2.0.0
+%{_libdir}/samba/libhcrypto-samba4.so.5
+%{_libdir}/samba/libhcrypto-samba4.so.5.0.1
+%{_libdir}/samba/libhdb-samba4.so.11
+%{_libdir}/samba/libhdb-samba4.so.11.0.2
+%{_libdir}/samba/libheimbase-samba4.so.1
+%{_libdir}/samba/libheimbase-samba4.so.1.0.0
+%{_libdir}/samba/libhx509-samba4.so.5
+%{_libdir}/samba/libhx509-samba4.so.5.0.0
+%{_libdir}/samba/libinterfaces.so
+%{_libdir}/samba/libkdc-policy.so
+%{_libdir}/samba/libkrb5-samba4.so.26
+%{_libdir}/samba/libkrb5-samba4.so.26.0.0
+%{_libdir}/samba/libldbsamba.so
+%{_libdir}/samba/liblibsmb.so
+%{_libdir}/samba/libmemcache.so
+%{_libdir}/samba/libndr-samba.so
+%{_libdir}/samba/libndr-samba4.so
+%{_libdir}/samba/libnetif.so
+%{_libdir}/samba/libnpa_tstream.so
+%{_libdir}/samba/libreplace.so
+%{_libdir}/samba/libroken-samba4.so.19
+%{_libdir}/samba/libroken-samba4.so.19.0.1
+%{_libdir}/samba/libsamba-modules.so
+%{_libdir}/samba/libsamba-net.so
+%{_libdir}/samba/libsamba-sockets.so
+%{_libdir}/samba/libsamba_python.so
+%{_libdir}/samba/libsamdb-common.so
+%{_libdir}/samba/libsecrets3.so
+%{_libdir}/samba/libsecurity.so
+%{_libdir}/samba/libserver-role.so
+%{_libdir}/samba/libshares.so
+%{_libdir}/samba/libsmbd_shim.so
+%{_libdir}/samba/libsmbpasswdparser.so
+%{_libdir}/samba/libsmbregistry.so
+%{_libdir}/samba/libstring_init.so
+%{_libdir}/samba/libtdb-wrap.so
+%{_libdir}/samba/libtdb_compat.so
+%{_libdir}/samba/libutil_cmdline.so
+%{_libdir}/samba/libutil_malloc.so
+%{_libdir}/samba/libutil_reg.so
+%{_libdir}/samba/libutil_sec.so
+%{_libdir}/samba/libutil_str.so
+%{_libdir}/samba/libwinbind-client.so
+%{_libdir}/samba/libwind-samba4.so.0
+%{_libdir}/samba/libwind-samba4.so.0.0.0
+%{_libdir}/samba/libwrap_xattr.so
+
+%if %{with_ldb}
+%{_libdir}/samba/libldb.so.1
+%{_libdir}/samba/libldb.so.%{ldb_version}
+%{_libdir}/samba/libpyldb-util.so.1
+%{_libdir}/samba/libpyldb-util.so.%{ldb_version}
+%endif
+%if %{with_talloc}
+%{_libdir}/samba/libtalloc.so.2
+%{_libdir}/samba/libtalloc.so.%{talloc_version}
+%{_libdir}/samba/libpytalloc-util.so.2
+%{_libdir}/samba/libpytalloc-util.so.%{talloc_version}
+%endif
+%if %{with_tevent}
+%{_libdir}/samba/libtevent.so.0
+%{_libdir}/samba/libtevent.so.%{tevent_version}
+%endif
+
+%files common
+%defattr(-,root,root)
+#%{_libdir}/samba/charset ???
+%{_libdir}/libnetapi.so.*
+%{_libdir}/samba/libsmbldap.so
+%{_libdir}/samba/libgpo.so
+%{_libdir}/samba/libprinting_migrate.so
+%{_datadir}/samba/codepages
+%attr(700,root,root) %dir /var/lib/samba/private
+%config(noreplace) %{_sysconfdir}/samba/smb.conf
+%config(noreplace) %{_sysconfdir}/samba/lmhosts
+%config(noreplace) %{_sysconfdir}/sysconfig/samba
+
+# common libraries
+%{_libdir}/samba/libads.so
+%{_libdir}/samba/libauth.so
+%{_libdir}/samba/liblibcli_lsa3.so
+%{_libdir}/samba/liblibcli_netlogon3.so
+%{_libdir}/samba/libmsrpc3.so
+%{_libdir}/samba/libnamearray.so
+%{_libdir}/samba/libnet_keytab.so
+%{_libdir}/samba/libpdb.so.*
+%{_libdir}/samba/libpopt_samba3.so
+%{_libdir}/samba/pdb
+
+%if %with_pam_smbpass
+/%{_lib}/security/pam_smbpass.so
+%endif
+
 %files dc
 %defattr(-,root,root)
 %{_bindir}/samba-tool
@@ -573,12 +723,29 @@ rm -rf %{buildroot}
 %{_sbindir}/samba_spnupdate
 %{_libdir}/mit_samba.so
 %{_libdir}/samba/bind9/dlz_bind9.so
-%{_libdir}/samba/libdb-glue.so
+%{_libdir}/samba/libcmdline-credentials.so
+%{_libdir}/samba/libdfs_server_ad.so
+%{_libdir}/samba/libdsdb-module.so
 %{_libdir}/samba/libheimntlm-samba4.so.1
 %{_libdir}/samba/libheimntlm-samba4.so.1.0.1
+%{_libdir}/samba/libkdc-samba4.so.2
+%{_libdir}/samba/libkdc-samba4.so.2.0.0
+%{_libdir}/samba/libpac.so
+%{_libdir}/samba/gensec
+%{_libdir}/samba/ldb
+%{_libdir}/samba/process_model
+%{_libdir}/samba/service
 %dir /var/lib/samba/sysvol
 %{_datadir}/samba/setup
 
+%files dc-libs
+%defattr(-,root,root)
+%{_libdir}/libdcerpc-server.so.*
+%{_libdir}/samba/libauth4.so
+%{_libdir}/samba/libntvfs.so
+%{_libdir}/samba/libprocess_model.so
+%{_libdir}/samba/libservice.so
+
 %files winbind
 %defattr(-,root,root)
 %{_bindir}/ntlm_auth3
@@ -607,18 +774,12 @@ rm -rf %{buildroot}
 
 %files winbind-clients
 %defattr(-,root,root)
+%{_bindir}/wbinfo
 %{_libdir}/libnss_winbind.so
 /%{_lib}/libnss_winbind.so.2
 %{_libdir}/libnss_wins.so
 /%{_lib}/libnss_wins.so.2
 /%{_lib}/security/pam_winbind.so
-%attr(755,root,root) %{_libdir}/libwbclient.so.*
-
-%files winbind-devel
-%defattr(-,root,root)
-%{_includedir}/samba-4.0/wbclient.h
-%{_libdir}/libwbclient.so
-%{_libdir}/pkgconfig/wbclient.pc
 
 %files client
 %defattr(-,root,root)
@@ -656,12 +817,10 @@ rm -rf %{buildroot}
 %{_bindir}/smbtree
 %{_bindir}/split_tokens
 %{_bindir}/testparm
-%{_bindir}/wbinfo
-#%{_bindir}/wbinfo3
 %{_libdir}/samba/libaddns.so
 %{_libdir}/samba/libcli_spoolss.so
 %{_libdir}/samba/libldb-cmdline.so
-%{_libdir}/samba/libutil_cmdline.so
+%{_libdir}/samba/libtrusts_util.so
 %{_mandir}/man1/nmblookup.1.gz
 %{_mandir}/man1/ntlm_auth.1.gz
 %{_mandir}/man1/oLschema2ldif.1.gz
@@ -708,6 +867,8 @@ rm -rf %{buildroot}
 %{_bindir}/versiontest
 %{_bindir}/vfstest
 %{_bindir}/vlp
+%{_libdir}/libtorture.so.*
+%{_libdir}/samba/libsubunit.so
 %{_mandir}/man1/gentest.1.gz
 %{_mandir}/man1/locktest.1.gz
 %{_mandir}/man1/masktest.1.gz
@@ -866,145 +1027,6 @@ rm -rf %{buildroot}
 %{_includedir}/samba-4.0/pytalloc.h
 %endif
 
-%files libs
-%defattr(-,root,root)
-%{_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-standard.so.*
-%{_libdir}/libndr.so.*
-#%{_libdir}/libnss_winbind.so.2
-#%{_libdir}/libnss_wins.so.2
-%{_libdir}/libregistry.so.*
-%{_libdir}/libsamba-credentials.so.*
-%{_libdir}/libsamba-hostconfig.so.*
-%{_libdir}/libsamba-policy.so.*
-%{_libdir}/libsamba-util.so.*
-%{_libdir}/libsamdb.so.*
-%{_libdir}/libsmbclient-raw.so.*
-%{_libdir}/libtevent-util.so.*
-%{_libdir}/libtorture.so.*
-#%{_libdir}/mit_samba.so
-%if %with_pam_smbpass
-/%{_lib}/security/pam_smbpass.so
-%endif
-
-# libraries needed by the public libraries
-%{_libdir}/samba/libLIBWBCLIENT_OLD.so
-%{_libdir}/samba/libUTIL_TDB.so
-%{_libdir}/samba/libasn1-samba4.so.8
-%{_libdir}/samba/libasn1-samba4.so.8.0.0
-%{_libdir}/samba/libasn1util.so
-%{_libdir}/samba/libauth.so
-%{_libdir}/samba/libauth4.so
-%{_libdir}/samba/libauth_sam_reply.so
-%{_libdir}/samba/libauthkrb5.so
-%{_libdir}/samba/libcli-ldap-common.so
-%{_libdir}/samba/libcli-ldap.so
-%{_libdir}/samba/libcli_cldap.so
-%{_libdir}/samba/libcli_smb_common.so
-%{_libdir}/samba/libcliauth.so
-%{_libdir}/samba/libcluster.so
-%{_libdir}/samba/libdcerpc-samba.so
-%{_libdir}/samba/liberrors.so
-%{_libdir}/samba/libevents.so
-%{_libdir}/samba/libflag_mapping.so
-%{_libdir}/samba/libgssapi-samba4.so.2
-%{_libdir}/samba/libgssapi-samba4.so.2.0.0
-%{_libdir}/samba/libhcrypto-samba4.so.5
-%{_libdir}/samba/libhcrypto-samba4.so.5.0.1
-%{_libdir}/samba/libheimbase-samba4.so.1
-%{_libdir}/samba/libheimbase-samba4.so.1.0.0
-%{_libdir}/samba/libhx509-samba4.so.5
-%{_libdir}/samba/libhx509-samba4.so.5.0.0
-%{_libdir}/samba/libkdc-policy.so
-%{_libdir}/samba/libkrb5-samba4.so.26
-%{_libdir}/samba/libkrb5-samba4.so.26.0.0
-%{_libdir}/samba/libldbsamba.so
-%{_libdir}/samba/libndr-samba.so
-%{_libdir}/samba/libndr-samba4.so
-%{_libdir}/samba/libnetif.so
-%{_libdir}/samba/libntvfs.so
-%{_libdir}/samba/libpdb.so.*
-%{_libdir}/samba/libreplace.so
-%{_libdir}/samba/libroken-samba4.so.19
-%{_libdir}/samba/libroken-samba4.so.19.0.1
-%{_libdir}/samba/libsamba-modules.so
-%{_libdir}/samba/libsamba-net.so
-%{_libdir}/samba/libsamba-sockets.so
-%{_libdir}/samba/libsamdb-common.so
-%{_libdir}/samba/libsecurity.so
-%{_libdir}/samba/libserver-role.so
-%{_libdir}/samba/libservice.so
-%{_libdir}/samba/libshares.so
-%{_libdir}/samba/libtdb-wrap.so
-%{_libdir}/samba/libwinbind-client.so
-%{_libdir}/samba/libwind-samba4.so.0
-%{_libdir}/samba/libwind-samba4.so.0.0.0
-%{_libdir}/samba/libHDB_SAMBA4.so
-%{_libdir}/samba/libads.so
-%{_libdir}/samba/libauth_unix_token.so
-%{_libdir}/samba/libcli-nbt.so
-%{_libdir}/samba/libcmdline-credentials.so
-%{_libdir}/samba/libdbwrap.so
-%{_libdir}/samba/libdcerpc-samba4.so
-%{_libdir}/samba/libdfs_server_ad.so
-%{_libdir}/samba/libdsdb-module.so
-%{_libdir}/samba/libhdb-samba4.so.11
-%{_libdir}/samba/libinterfaces.so
-%{_libdir}/samba/libhdb-samba4.so.11.0.2
-%{_libdir}/samba/libkdc-samba4.so.2
-%{_libdir}/samba/liblibcli_lsa3.so
-%{_libdir}/samba/liblibsmb.so
-%{_libdir}/samba/libmemcache.so
-%{_libdir}/samba/libmsrpc3.so
-%{_libdir}/samba/libnpa_tstream.so
-%{_libdir}/samba/libpac.so
-%{_libdir}/samba/libsamba_python.so
-%{_libdir}/libsmbconf.so.*
-%{_libdir}/samba/libsmbd_shim.so
-%{_libdir}/samba/libsmbregistry.so
-%{_libdir}/samba/libsmbpasswdparser.so
-%{_libdir}/samba/libwrap_xattr.so
-%{_libdir}/samba/libsubunit.so
-%{_libdir}/samba/libtrusts_util.so
-%{_libdir}/samba/libutil_reg.so
-%{_libdir}/samba/libutil_str.so
-%{_libdir}/samba/libprocess_model.so
-%{_libdir}/samba/liblibcli_netlogon3.so
-%{_libdir}/samba/libkdc-samba4.so.2.0.0
-
-#%{_libdir}/winbind_krb5_locator.so
-
-%{_libdir}/samba/auth
-#%{_libdir}/samba/idmap
-%{_libdir}/samba/gensec
-%{_libdir}/samba/ldb
-%{_libdir}/samba/process_model
-%{_libdir}/samba/service
-
-%if %{with_ldb}
-%{_libdir}/samba/libldb.so.1
-%{_libdir}/samba/libldb.so.%{ldb_version}
-%{_libdir}/samba/libpyldb-util.so.1
-%{_libdir}/samba/libpyldb-util.so.%{ldb_version}
-%endif
-%if %{with_talloc}
-%{_libdir}/samba/libtalloc.so.2
-%{_libdir}/samba/libtalloc.so.%{talloc_version}
-%{_libdir}/samba/libpytalloc-util.so.2
-%{_libdir}/samba/libpytalloc-util.so.%{talloc_version}
-%endif
-%if %{with_tevent}
-%{_libdir}/samba/libtevent.so.0
-%{_libdir}/samba/libtevent.so.%{tevent_version}
-%endif
-
 %files python
 %defattr(-,root,root,-)
 %{python_sitearch}/*
@@ -1017,19 +1039,6 @@ rm -rf %{buildroot}
 %{_mandir}/man3/Parse*
 %attr(755,root,root) %{_bindir}/pidl
 
-%files common
-%defattr(-,root,root)
-#%{_libdir}/samba/charset ???
-%{_libdir}/libnetapi.so.*
-%{_libdir}/samba/libsmbldap.so
-%{_libdir}/samba/libgpo.so
-%{_libdir}/samba/libprinting_migrate.so
-%{_datadir}/samba/codepages
-%attr(700,root,root) %dir /var/lib/samba/private
-%config(noreplace) %{_sysconfdir}/samba/smb.conf
-%config(noreplace) %{_sysconfdir}/samba/lmhosts
-%config(noreplace) %{_sysconfdir}/sysconfig/samba
-
 %files swat
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/xinetd.d/swat
@@ -1053,6 +1062,19 @@ rm -rf %{buildroot}
 #%{_libdir}/pkgconfig/smbsharemodes.pc
 #%{_mandir}/man7/libsmbclient.7*
 
+%files -n libwbclient
+%defattr(-,root,root)
+%{_libdir}/libwbclient.so.*
+
+%files -n libwbclient-devel
+%defattr(-,root,root)
+%{_includedir}/samba-4.0/wbclient.h
+%{_libdir}/libwbclient.so
+%{_libdir}/pkgconfig/wbclient.pc
+
+%defattr(-,root,root)
+%{_libdir}/libwbclient.so.*
+
 %changelog
 * Wed Aug 24 2011 Guenther Deschner <gdeschner@redhat.com> - 4.0-1
 - initial package