More shared modules and some library cleanup.

1 files changed, 64 insertions, 61 deletions

diff --git a/samba4.spec b/samba4.spec
index 59c9a5d..6f2544b 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -129,7 +129,6 @@ of SMB/CIFS shares and printing to SMB/CIFS printers.
 %package libs
 Summary: Samba libraries
 Group: Applications/System
-Requires: %{name}-common = %{version}-%{release}
 
 # Remove for Fedora and RHEL
 Obsoletes: samba-4.0-libs
@@ -358,12 +357,13 @@ The samba-dc package provides AD Domain Controller functionality
         --with-lockdir=/var/lib/samba \
         --disable-gnutls \
         --disable-rpath-install \
-	--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 \
+	--with-shared-modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2,pdb_tdbsam,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 \
         --builtin-libraries=ccan \
         --bundled-libraries=%{_samba4_libraries} \
 %if ! %with_pam_smbpass
 	--without-pam_smbpass
 %endif
+#	--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 \
 #	--bundled-libraries=heimdal,!talloc,!tdb,!tevent,!ldb,!zlib
 
 #        --with-modulesdir=%{_libdir}/{name} \
@@ -532,6 +532,23 @@ rm -rf %{buildroot}
 %{_sbindir}/nmbd
 %{_sbindir}/smbd
 %{_mandir}/man8/samba.8.gz
+%{_libdir}/libsmbconf.so.*
+%{_libdir}/samba/libCHARSET3.so
+%{_libdir}/samba/libdbwrap.so
+%{_libdir}/samba/libinterfaces.so
+%{_libdir}/samba/libmemcache.so
+%{_libdir}/samba/libpopt_samba3.so
+%{_libdir}/samba/libsmbd_base.so
+%{_libdir}/samba/libsmbd_conn.so
+%{_libdir}/samba/libsmbd_shim.so
+%{_libdir}/samba/libsmbregistry.so
+%{_libdir}/samba/libstring_init.so
+%{_libdir}/samba/libtdb_compat.so
+%{_libdir}/samba/libutil_malloc.so
+%{_libdir}/samba/libutil_reg.so
+%{_libdir}/samba/libutil_sec.so
+%{_libdir}/samba/libutil_str.so
+%{_libdir}/samba/pdb
 %{_libdir}/samba/vfs
 %{_unitdir}/nmb.service
 %{_unitdir}/smb.service
@@ -553,6 +570,7 @@ rm -rf %{buildroot}
 %{_sbindir}/samba_dnsupdate
 %{_sbindir}/samba_spnupdate
 %{_libdir}/mit_samba.so
+%{_libdir}/samba/bind9/dlz_bind9.so
 %dir /var/lib/samba/sysvol
 %{_datadir}/samba/setup
 
@@ -849,7 +867,6 @@ rm -rf %{buildroot}
 %{_libdir}/libndr-nbt.so.*
 %{_libdir}/libndr-standard.so.*
 %{_libdir}/libndr.so.*
-%{_libdir}/libnetapi.so.*
 #%{_libdir}/libnss_winbind.so.2
 #%{_libdir}/libnss_wins.so.2
 %{_libdir}/libregistry.so.*
@@ -859,7 +876,6 @@ rm -rf %{buildroot}
 %{_libdir}/libsamba-util.so.*
 %{_libdir}/libsamdb.so.*
 %{_libdir}/libsmbclient-raw.so.*
-%{_libdir}/libsmbconf.so.*
 %{_libdir}/libtevent-util.so.*
 %{_libdir}/libtorture.so.*
 #%{_libdir}/mit_samba.so
@@ -867,111 +883,97 @@ rm -rf %{buildroot}
 /%{_lib}/security/pam_smbpass.so
 %endif
 
-%{_libdir}/samba/bind9/dlz_bind9.so
-%{_libdir}/samba/libCHARSET3.so
+# libraries needed by the public libraries
+%{_libdir}/samba/libLIBWBCLIENT_OLD.so
 %{_libdir}/samba/libUTIL_TDB.so
-%{_libdir}/samba/libaddns.so
-%{_libdir}/samba/libads.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.so
 %{_libdir}/samba/libauth4.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/libcli_spoolss.so
 %{_libdir}/samba/libcliauth.so
 %{_libdir}/samba/libcluster.so
-%{_libdir}/samba/libcmdline-credentials.so
-%{_libdir}/samba/libdb-glue.so
-%{_libdir}/samba/libdbwrap.so
 %{_libdir}/samba/libdcerpc-samba.so
-%{_libdir}/samba/libdcerpc-samba4.so
-%{_libdir}/samba/libdfs_server_ad.so
-%{_libdir}/samba/libdsdb-module.so
 %{_libdir}/samba/liberrors.so
-%{_libdir}/samba/libevents.so
 %{_libdir}/samba/libflag_mapping.so
-%{_libdir}/samba/libgpo.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/libHDB_SAMBA4.so
 %{_libdir}/samba/libheimbase-samba4.so.1
 %{_libdir}/samba/libheimbase-samba4.so.1.0.0
-%{_libdir}/samba/libheimntlm-samba4.so.1
-%{_libdir}/samba/libheimntlm-samba4.so.1.0.1
 %{_libdir}/samba/libhx509-samba4.so.5
 %{_libdir}/samba/libhx509-samba4.so.5.0.0
-%{_libdir}/samba/libidmap.so
-%{_libdir}/samba/libinterfaces.so
 %{_libdir}/samba/libkdc-policy.so
-%{_libdir}/samba/libkdc-samba4.so.2
-%{_libdir}/samba/libkdc-samba4.so.2.0.0
 %{_libdir}/samba/libkrb5-samba4.so.26
 %{_libdir}/samba/libkrb5-samba4.so.26.0.0
-%{_libdir}/samba/libldb-cmdline.so
 %{_libdir}/samba/libldbsamba.so
-%{_libdir}/samba/liblibcli_lsa3.so
-%{_libdir}/samba/liblibcli_netlogon3.so
-%{_libdir}/samba/liblibsmb.so
-%{_libdir}/samba/libmemcache.so
-%{_libdir}/samba/libmsrpc3.so
-%{_libdir}/samba/libnamearray.so
 %{_libdir}/samba/libndr-samba.so
 %{_libdir}/samba/libndr-samba4.so
 %{_libdir}/samba/libnetif.so
-%{_libdir}/samba/libnet_keytab.so
-%{_libdir}/samba/libnpa_tstream.so
-%{_libdir}/samba/libnss_info.so
 %{_libdir}/samba/libntvfs.so
-%{_libdir}/samba/libpac.so
-%{_libdir}/samba/libpdb.so.*
-%{_libdir}/samba/libpopt_samba3.so
-%{_libdir}/samba/libprinting_migrate.so
-%{_libdir}/samba/libprocess_model.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/libsecurity.so
 %{_libdir}/samba/libserver-role.so
 %{_libdir}/samba/libservice.so
 %{_libdir}/samba/libshares.so
-%{_libdir}/samba/libsmbd_base.so
-%{_libdir}/samba/libsmbd_conn.so
-%{_libdir}/samba/libsmbd_shim.so
+%{_libdir}/samba/libtdb-wrap.so
+%{_libdir}/samba/libwind-samba4.so.0
+%{_libdir}/samba/libwind-samba4.so.0.0.0
+%{_libdir}/samba/libcli_smb_common.so
+
+%{_libdir}/samba/libaddns.so
+%{_libdir}/samba/libads.so
+%{_libdir}/samba/libadt_tree.so
+%{_libdir}/samba/libauth.so
+%{_libdir}/samba/libauth_unix_token.so
+%{_libdir}/samba/libcli-nbt.so
+%{_libdir}/samba/libcli_spoolss.so
+%{_libdir}/samba/libcmdline-credentials.so
+%{_libdir}/samba/libdb-glue.so
+%{_libdir}/samba/libdcerpc-samba4.so
+%{_libdir}/samba/libdfs_server_ad.so
+%{_libdir}/samba/libdsdb-module.so
+%{_libdir}/samba/libevents.so
+%{_libdir}/samba/libgpo.so
+%{_libdir}/samba/libhdb-samba4.so.11
+%{_libdir}/samba/libhdb-samba4.so.11.0.2
+%{_libdir}/samba/libHDB_SAMBA4.so
+%{_libdir}/samba/libheimntlm-samba4.so.1
+%{_libdir}/samba/libheimntlm-samba4.so.1.0.1
+%{_libdir}/samba/libidmap.so
+%{_libdir}/samba/libkdc-samba4.so.2
+%{_libdir}/samba/libkdc-samba4.so.2.0.0
+%{_libdir}/samba/libldb-cmdline.so
+%{_libdir}/samba/liblibcli_lsa3.so
+%{_libdir}/samba/liblibcli_netlogon3.so
+%{_libdir}/samba/liblibsmb.so
+%{_libdir}/samba/libmsrpc3.so
+%{_libdir}/samba/libnamearray.so
+%{_libdir}/samba/libnet_keytab.so
+%{_libdir}/samba/libnpa_tstream.so
+%{_libdir}/samba/libnss_info.so
+%{_libdir}/samba/libpac.so
+%{_libdir}/samba/libpdb.so.*
+%{_libdir}/samba/libprinting_migrate.so
+%{_libdir}/samba/libprocess_model.so
+%{_libdir}/samba/libsamba_python.so
 %{_libdir}/samba/libsmbldap.so
 %{_libdir}/samba/libsmbpasswdparser.so
-%{_libdir}/samba/libsmbregistry.so
-%{_libdir}/samba/libstring_init.so
 %{_libdir}/samba/libsubunit.so
-%{_libdir}/samba/libtdb-wrap.so
-%{_libdir}/samba/libtdb_compat.so
 %{_libdir}/samba/libtrusts_util.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/libLIBWBCLIENT_OLD.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
 
 #%{_libdir}/winbind_krb5_locator.so
@@ -1015,6 +1017,7 @@ rm -rf %{buildroot}
 %files common
 %defattr(-,root,root)
 #%{_libdir}/samba/charset ???
+%{_libdir}/libnetapi.so.*
 %{_datadir}/samba/codepages
 %attr(700,root,root) %dir /var/lib/samba/private
 %config(noreplace) %{_sysconfdir}/samba/smb.conf