diff --git a/.fmf/version b/.fmf/version
deleted file mode 100644
index d00491f..0000000
--- a/.fmf/version
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index c2182c7..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
diff --git a/plans.fmf b/plans.fmf
deleted file mode 100644
index e6427de..0000000
--- a/plans.fmf
+++ /dev/null
@@ -1,4 +0,0 @@
-discover:
-    how: fmf
-execute:
-    how: tmt
diff --git a/rpminspect.yaml b/rpminspect.yaml
index f736bfa..c1455e2 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -4,7 +4,6 @@ inspections:
 
 badfuncs:
     ignore:
-        - /usr/bin/nmbd
         - /usr/bin/nmblookup
         - /usr/bin/smbtorture
         - /usr/lib*/libndr.so.*
@@ -26,10 +25,3 @@ abidiff:
 debuginfo:
     ignore:
         - /usr/lib*/libdcerpc-samr.so.*
-
-annocheck:
-    ignore:
-        - /usr/bin/gentest
-        - /usr/bin/locktest
-        - /usr/bin/masktest
-        - /usr/bin/smbtorture
diff --git a/samba.spec b/samba.spec
index b49a21a..647fc92 100644
--- a/samba.spec
+++ b/samba.spec
@@ -243,7 +243,7 @@ Patch0:         samba-4.23-fix-cmocka.patch
 
 Requires(pre): %{name}-common = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-common-tools = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
@@ -465,7 +465,7 @@ Unix.
 Summary: Samba client programs
 Requires(pre): %{name}-common = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
 Requires: libldb = %{samba_depver}
 %if %{with libsmbclient}
@@ -488,62 +488,12 @@ The %{name}-client package provides some SMB/CIFS clients to complement
 the built-in SMB/CIFS filesystem in Linux. These clients allow access
 of SMB/CIFS shares and printing to SMB/CIFS printers.
 
-### CORE-LIBS
-%package core-libs
-Summary: Samba core libraries
-Requires(pre): %{name}-common = %{samba_depver}
-Requires: %{name}-common = %{samba_depver}
-
-Provides: bundled(libreplace) = %{samba_depver}
-
-%description core-libs
-The samba-core-libs package contains foundational libraries needed by
-both Samba servers and clients. This includes error handling, utilities,
-and basic support libraries.
-
-### NDR-LIBS
-%package ndr-libs
-Summary: Samba NDR libraries
-Requires(pre): %{name}-common = %{samba_depver}
-Requires: %{name}-common = %{samba_depver}
-Requires: %{name}-core-libs = %{samba_depver}
-
-Provides: %{name}-common-libs = %{samba_depver}
-Obsoletes: %{name}-common-libs < %{samba_depver}
-
-%if %{without dc} && %{without testsuite}
-Obsoletes: samba-dc < %{samba_depver}
-Obsoletes: samba-dc-libs < %{samba_depver}
-Obsoletes: samba-dc-bind-dlz < %{samba_depver}
-%endif
-
-# ctdb-tests package has been dropped if we do not build the testsuite
-%if %{with clustering}
-%if %{without testsuite}
-Obsoletes: ctdb-tests < %{samba_depver}
-Obsoletes: ctdb-tests-debuginfo < %{samba_depver}
-# endif without testsuite
-%endif
-# endif with clustering
-%endif
-
-# We only build glusterfs for RHGS and Fedora, so obsolete it on other versions
-# of the distro
-%if %{without vfs_glusterfs}
-Obsoletes: samba-vfs-glusterfs < %{samba_depver}
-# endif without vfs_glusterfs
-%endif
-
-%description ndr-libs
-The samba-ndr-libs package contains NDR (Network Data Representation)
-encoding libraries used by both Samba servers and clients.
-
 ### CLIENT-LIBS
 %package client-libs
 Summary: Samba client libraries
 Requires(pre): %{name}-common = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: libldb = %{samba_depver}
 %if %{with libwbclient}
 Requires: libwbclient = %{samba_depver}
@@ -573,10 +523,50 @@ Obsoletes: samba4-common < %{samba_depver}
 samba-common provides files necessary for both the server and client
 packages of Samba.
 
+### COMMON-LIBS
+%package common-libs
+Summary: Libraries used by both Samba servers and clients
+Requires(pre): samba-common = %{samba_depver}
+Requires: samba-common = %{samba_depver}
+Requires: %{name}-client-libs = %{samba_depver}
+Requires: libldb = %{samba_depver}
+%if %{with libwbclient}
+Requires: libwbclient = %{samba_depver}
+%endif
+
+Provides: bundled(libreplace) = %{samba_depver}
+
+%if %{without dc} && %{without testsuite}
+Obsoletes: samba-dc < %{samba_depver}
+Obsoletes: samba-dc-libs < %{samba_depver}
+Obsoletes: samba-dc-bind-dlz < %{samba_depver}
+%endif
+
+# ctdb-tests package has been dropped if we do not build the testsuite
+%if %{with clustering}
+%if %{without testsuite}
+Obsoletes: ctdb-tests < %{samba_depver}
+Obsoletes: ctdb-tests-debuginfo < %{samba_depver}
+# endif without testsuite
+%endif
+# endif with clustering
+%endif
+
+# We only build glusterfs for RHGS and Fedora, so obsolete it on other versions
+# of the distro
+%if %{without vfs_glusterfs}
+Obsoletes: samba-vfs-glusterfs < %{samba_depver}
+# endif without vfs_glusterfs
+%endif
+
+%description common-libs
+The samba-common-libs package contains internal libraries needed by the
+SMB/CIFS clients.
+
 ### COMMON-TOOLS
 %package common-tools
 Summary: Tools for Samba clients
-Requires: samba-ndr-libs = %{samba_depver}
+Requires: samba-common-libs = %{samba_depver}
 Requires: samba-client-libs = %{samba_depver}
 Requires: samba-libs = %{samba_depver}
 Requires: samba-ldb-ldap-modules = %{samba_depver}
@@ -614,7 +604,7 @@ and for GPO management on domain members.
 ### RPC
 %package dcerpc
 Summary: DCE RPC binaries
-Requires: samba-ndr-libs = %{samba_depver}
+Requires: samba-common-libs = %{samba_depver}
 Requires: samba-client-libs = %{samba_depver}
 Requires: samba-libs = %{samba_depver}
 Requires: libldb = %{samba_depver}
@@ -632,7 +622,7 @@ The samba-dcerpc package contains binaries that serve DCERPC over named pipes.
 Summary: Samba AD Domain Controller
 Requires: %{name} = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-common-tools = %{samba_depver}
 Requires: %{name}-tools = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
@@ -676,7 +666,7 @@ The samba-dc-provision package provides files to setup a domain controller
 %package dc-libs
 Summary: Samba AD Domain Controller Libraries
 Requires: %{name}-client-libs = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
 Requires: libldb = %{samba_depver}
 Requires: libwbclient = %{samba_depver}
@@ -714,10 +704,8 @@ name server related details of Samba AD.
 ### DEVEL
 %package devel
 Summary: Developer tools for Samba libraries
-Requires: %{name}-core-libs = %{samba_depver}
-Requires: %{name}-client-libs = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
+Requires: %{name}-client-libs = %{samba_depver}
 Requires: %{name}-dc-libs = %{samba_depver}
 Requires: libnetapi = %{samba_depver}
 
@@ -772,7 +760,7 @@ Summary: Samba VFS module for GlusterFS
 Requires: glusterfs-api >= 3.4.0.16
 Requires: glusterfs >= 3.4.0.16
 Requires: %{name} = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
 Requires: libldb = %{samba_depver}
@@ -823,7 +811,7 @@ the Kerberos credentials cache of the user issuing the print job.
 %package ldb-ldap-modules
 Summary: Samba ldap modules for ldb
 Requires: %{name}-client-libs = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: libldb = %{samba_depver}
 Requires: libwbclient = %{samba_depver}
 
@@ -834,7 +822,7 @@ samba-gpupdate.
 ### LIBS
 %package libs
 Summary: Samba libraries
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
 Requires: libldb = %{samba_depver}
 %if %{with libwbclient}
@@ -855,7 +843,7 @@ against the SMB, RPC and other protocols provided by the Samba suite.
 Summary: The NETAPI library
 Requires(pre): %{name}-common = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
 Requires: libldb = %{samba_depver}
 Requires: libwbclient = %{samba_depver}
@@ -877,7 +865,7 @@ develop programs that link against the NETAPI library in the Samba suite.
 Summary: The SMB client library
 Requires(pre): %{name}-common = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
 Requires: libldb = %{samba_depver}
 %if %{with libwbclient}
@@ -902,7 +890,7 @@ suite.
 %if %{with libwbclient}
 %package -n libwbclient
 Summary: The winbind client library
-# libwbclient.so only links to libc - no samba library dependencies needed
+Requires: %{name}-client-libs = %{samba_depver}
 Conflicts: sssd-libwbclient
 
 %description -n libwbclient
@@ -927,7 +915,7 @@ library.
 %package -n python3-%{name}
 Summary: Samba Python3 libraries
 Requires: %{name}-client-libs = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
 Requires: %{name}-dc-libs = %{samba_depver}
 Requires: python3-cryptography
@@ -997,7 +985,7 @@ Requires: %{name} = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
 Requires: %{name}-winbind = %{samba_depver}
 
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
 Requires: %{name}-test-libs = %{samba_depver}
@@ -1028,7 +1016,7 @@ packages of Samba.
 ### TEST-LIBS
 %package test-libs
 Summary: Libraries need by the testing tools for Samba servers and clients
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
 Requires: libldb = %{samba_depver}
@@ -1061,8 +1049,8 @@ as a user using the `net usershare` command.
 Summary: Samba winbind
 Requires(pre): %{name}-common = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
-Requires(post): %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
+Requires(post): %{name}-common-libs = %{samba_depver}
 Requires: %{name}-common-tools = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
 Requires(post): %{name}-client-libs = %{samba_depver}
@@ -1095,7 +1083,7 @@ Windows user and group accounts on Linux.
 %package winbind-clients
 Summary: Samba winbind clients
 Requires: %{name}-common = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
 Requires: %{name}-winbind = %{samba_depver}
@@ -1165,7 +1153,7 @@ necessary to communicate to the Winbind Daemon
 Summary: Samba Winexe Windows Binary
 License: GPL-3.0-only
 Requires: %{name}-client-libs = %{samba_depver}
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: libldb = %{samba_depver}
 Requires: libwbclient = %{samba_depver}
 
@@ -1180,7 +1168,7 @@ Winexe is a Remote Windows-command executor
 %package -n ctdb
 Summary: A Clustered Database based on Samba's Trivial Database (TDB)
 
-Requires: %{name}-ndr-libs = %{samba_depver}
+Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
 Requires: %{name}-winbind-clients = %{samba_depver}
 
@@ -1727,7 +1715,7 @@ fi
 
 %ldconfig_scriptlets client-libs
 
-%ldconfig_scriptlets ndr-libs
+%ldconfig_scriptlets common-libs
 
 %if %{with dc}
 %ldconfig_scriptlets dc-libs
@@ -2021,104 +2009,33 @@ fi
 #endif with includelibs
 %endif
 
-### CORE-LIBS
-%files core-libs
-%dir %{_libdir}/samba
-
-#
-# Tier 0: Private libraries - libc only dependencies
-#
-%{_libdir}/samba/libreplace-private-samba.so
-%{_libdir}/samba/libsocket-blocking-private-samba.so
-%{_libdir}/samba/libsys-rw-private-samba.so
-%{_libdir}/samba/libtime-basic-private-samba.so
-
-#
-# Tier 1: Private libraries - system libs (libtalloc, libsystemd)
-#
-%{_libdir}/samba/libsamba-debug-private-samba.so
-%{_libdir}/samba/libserver-role-private-samba.so
-
-#
-# Tier 1: Public libraries - system libs (libtalloc)
-#
-%{_libdir}/libsamba-errors.so.%{libsamba_errors_so_version}*
-
-#
-# Tier 2: Private libraries - adds gnutls
-#
-%{_libdir}/samba/libgenrand-private-samba.so
-
-#
-# Tier 2: Public libraries - adds gnutls, icu, tevent
-#
-%{_libdir}/libsamba-util.so.%{libsamba_util_so_version}*
-%{_libdir}/libtevent-util.so.%{libtevent_util_so_version}*
-
-### NDR-LIBS
-%files ndr-libs
-
-#
-# Core NDR library
-#
-%{_libdir}/libndr.so.%{libndr_so_version}*
-
-#
-# Tier 0: libc only dependencies
-#
-%{_libdir}/samba/libutil-setid-private-samba.so
-%{_libdir}/samba/libutil-tdb-private-samba.so
-
-#
-# Tier 1: system libs only (libtalloc)
-#
-%{_libdir}/samba/libiov-buf-private-samba.so
-%{_libdir}/samba/libstable-sort-private-samba.so
-%{_libdir}/samba/libtalloc-report-private-samba.so
-%{_libdir}/samba/libtalloc-report-printf-private-samba.so
-
-#
-# Tier 2: depends on core-libs (debug, replace)
-#
-%{_libdir}/samba/libflag-mapping-private-samba.so
-%{_libdir}/samba/libinterfaces-private-samba.so
-%{_libdir}/samba/libtdb-wrap-private-samba.so
-
-#
-# Tier 3: depends on core-libs (util, errors, ndr)
-#
-%{_libdir}/samba/libdbwrap-private-samba.so
-%{_libdir}/samba/libsamba3-util-private-samba.so
-%{_libdir}/samba/libutil-reg-private-samba.so
-
-#
-# Tier 4: depends on core-libs + Tier 3 libs
-#
-%{_libdir}/samba/libsamba-security-private-samba.so
-
-#
-# NDR encoding libraries
-#
-%{_libdir}/libndr-nbt.so.%{libndr_nbt_so_version}*
-%{_libdir}/libndr-standard.so.%{libndr_standard_so_version}*
-%{_libdir}/libndr-krb5pac.so.%{libndr_krb5pac_so_version}*
-
 ### CLIENT-LIBS
 %files client-libs
 %{_libdir}/libdcerpc-binding.so.%{libdcerpc_binding_so_version}*
 %{_libdir}/libdcerpc-server-core.so.%{libdcerpc_server_core_so_version}*
 %{_libdir}/libdcerpc.so.%{libdcerpc_so_version}*
+%{_libdir}/libndr-krb5pac.so.%{libndr_krb5pac_so_version}*
+%{_libdir}/libndr-nbt.so.%{libndr_nbt_so_version}*
+%{_libdir}/libndr-standard.so.%{libndr_standard_so_version}*
+%{_libdir}/libndr.so.%{libndr_so_version}*
 %{_libdir}/libsamba-credentials.so.%{libsamba_credentials_so_version}*
+%{_libdir}/libsamba-errors.so.%{libsamba_errors_so_version}*
 %{_libdir}/libsamba-hostconfig.so.%{libsamba_hostconfig_so_version}*
 %{_libdir}/libsamba-passdb.so.%{libsamba_passdb_so_version}*
+%{_libdir}/libsamba-util.so.%{libsamba_util_so_version}*
 %{_libdir}/libsamdb.so.%{libsamdb_so_version}*
 %{_libdir}/libsmbconf.so.%{libsmbconf_so_version}*
 %{_libdir}/libsmbldap.so.%{libsmbldap_so_version}*
+%{_libdir}/libtevent-util.so.%{libtevent_util_so_version}*
+
+%dir %{_libdir}/samba
 %{_libdir}/samba/libCHARSET3-private-samba.so
 %{_libdir}/samba/libMESSAGING-SEND-private-samba.so
+%{_libdir}/samba/libMESSAGING-private-samba.so
 %{_libdir}/samba/libaddns-private-samba.so
 %{_libdir}/samba/libads-private-samba.so
 %{_libdir}/samba/libasn1util-private-samba.so
+%{_libdir}/samba/libauth-private-samba.so
 %{_libdir}/samba/libauthkrb5-private-samba.so
 %{_libdir}/samba/libcli-cldap-private-samba.so
 %{_libdir}/samba/libcli-ldap-common-private-samba.so
@@ -2131,12 +2048,20 @@ fi
 %{_libdir}/samba/libcluster-private-samba.so
 %{_libdir}/samba/libcmdline-contexts-private-samba.so
 %{_libdir}/samba/libcommon-auth-private-samba.so
+%{_libdir}/samba/libctdb-event-client-private-samba.so
+%{_libdir}/samba/libdbwrap-private-samba.so
 %{_libdir}/samba/libdcerpc-pkt-auth-private-samba.so
 %{_libdir}/samba/libdcerpc-samba-private-samba.so
 %{_libdir}/samba/libevents-private-samba.so
+%{_libdir}/samba/libflag-mapping-private-samba.so
+%{_libdir}/samba/libgenrand-private-samba.so
 %{_libdir}/samba/libgensec-private-samba.so
+%{_libdir}/samba/libgpext-private-samba.so
+%{_libdir}/samba/libgpo-private-samba.so
 %{_libdir}/samba/libgse-private-samba.so
 %{_libdir}/samba/libhttp-private-samba.so
+%{_libdir}/samba/libinterfaces-private-samba.so
+%{_libdir}/samba/libiov-buf-private-samba.so
 %{_libdir}/samba/libkrb5samba-private-samba.so
 %{_libdir}/samba/libldbsamba-private-samba.so
 %{_libdir}/samba/liblibcli-lsa3-private-samba.so
@@ -2149,36 +2074,45 @@ fi
 %{_libdir}/samba/libmsrpc3-private-samba.so
 %{_libdir}/samba/libndr-samba-private-samba.so
 %{_libdir}/samba/libndr-samba4-private-samba.so
+%{_libdir}/samba/libnet-keytab-private-samba.so
 %{_libdir}/samba/libnetif-private-samba.so
 %if 0%{?rhel}
 %{_libdir}/samba/libngtcp2-crypto-gnutls-private-samba.so
 %{_libdir}/samba/libngtcp2-private-samba.so
 %endif
 %{_libdir}/samba/libnpa-tstream-private-samba.so
+%{_libdir}/samba/libposix-eadb-private-samba.so
+%{_libdir}/samba/libprinter-driver-private-samba.so
+%{_libdir}/samba/libprinting-migrate-private-samba.so
 %{_libdir}/samba/libquic-private-samba.so
 %{_libdir}/samba/libregistry-private-samba.so
 %{_libdir}/samba/libsamba-cluster-support-private-samba.so
+%{_libdir}/samba/libsamba-debug-private-samba.so
 %{_libdir}/samba/libsamba-modules-private-samba.so
+%{_libdir}/samba/libsamba-security-private-samba.so
 %{_libdir}/samba/libsamba-security-trusts-private-samba.so
 %{_libdir}/samba/libsamba-sockets-private-samba.so
+%{_libdir}/samba/libsamba3-util-private-samba.so
 %{_libdir}/samba/libsamdb-common-private-samba.so
 %{_libdir}/samba/libsecrets3-private-samba.so
 %{_libdir}/samba/libserver-id-db-private-samba.so
+%{_libdir}/samba/libserver-role-private-samba.so
 %{_libdir}/samba/libsmbclient-raw-private-samba.so
+%{_libdir}/samba/libsmbd-base-private-samba.so
 %{_libdir}/samba/libsmbd-shim-private-samba.so
-
-#
-# Command line library
-#
-%{_libdir}/samba/libcmdline-private-samba.so
-
-#
-# Password database modules (depend on libsamba-passdb)
-#
-%dir %{_libdir}/samba/ldb
-%dir %{_libdir}/samba/pdb
-%{_libdir}/samba/pdb/smbpasswd.so
-%{_libdir}/samba/pdb/tdbsam.so
+%{_libdir}/samba/libsmbldaphelper-private-samba.so
+%{_libdir}/samba/libstable-sort-private-samba.so
+%{_libdir}/samba/libsys-rw-private-samba.so
+%{_libdir}/samba/libsocket-blocking-private-samba.so
+%{_libdir}/samba/libtalloc-report-printf-private-samba.so
+%{_libdir}/samba/libtalloc-report-private-samba.so
+%{_libdir}/samba/libtdb-wrap-private-samba.so
+%{_libdir}/samba/libtime-basic-private-samba.so
+%{_libdir}/samba/libtorture-private-samba.so
+%{_libdir}/samba/libutil-crypt-private-samba.so
+%{_libdir}/samba/libutil-reg-private-samba.so
+%{_libdir}/samba/libutil-setid-private-samba.so
+%{_libdir}/samba/libutil-tdb-private-samba.so
 
 %if %{without libwbclient}
 %{_libdir}/samba/libwbclient.so.*
@@ -2229,6 +2163,19 @@ fi
 %{_mandir}/man5/smbpasswd.5*
 %{_mandir}/man7/samba.7*
 
+### COMMON-LIBS
+%files common-libs
+# common libraries
+%{_libdir}/samba/libcmdline-private-samba.so
+%{_libdir}/samba/libreplace-private-samba.so
+
+%dir %{_libdir}/samba/ldb
+
+%dir %{_libdir}/samba/pdb
+%{_libdir}/samba/pdb/ldapsam.so
+%{_libdir}/samba/pdb/smbpasswd.so
+%{_libdir}/samba/pdb/tdbsam.so
+
 ### COMMON-TOOLS
 %files common-tools
 %{_bindir}/net
@@ -2585,28 +2532,6 @@ fi
 %{_libdir}/samba/libRPC-SERVER-LOOP-private-samba.so
 %{_libdir}/samba/libRPC-WORKER-private-samba.so
 
-#
-# Server-side libraries (not used by libsmbclient)
-#
-%{_libdir}/samba/libauth-private-samba.so
-%{_libdir}/samba/libctdb-event-client-private-samba.so
-%{_libdir}/samba/libgpext-private-samba.so
-%{_libdir}/samba/libgpo-private-samba.so
-%{_libdir}/samba/libMESSAGING-private-samba.so
-%{_libdir}/samba/libnet-keytab-private-samba.so
-%{_libdir}/samba/libposix-eadb-private-samba.so
-%{_libdir}/samba/libprinter-driver-private-samba.so
-%{_libdir}/samba/libprinting-migrate-private-samba.so
-%{_libdir}/samba/libsmbd-base-private-samba.so
-%{_libdir}/samba/libsmbldaphelper-private-samba.so
-%{_libdir}/samba/libtorture-private-samba.so
-%{_libdir}/samba/libutil-crypt-private-samba.so
-
-#
-# Password database modules (server-side, links to libsmbldaphelper)
-#
-%{_libdir}/samba/pdb/ldapsam.so
-
 ### LIBNETAPI
 %files -n libnetapi
 %{_libdir}/libnetapi.so.%{libnetapi_so_version}*
@@ -3904,6 +3829,7 @@ fi
 %if %{with dc}
 %{_libdir}/samba/libdlz-bind9-for-torture-private-samba.so
 %endif
+%{_libdir}/samba/libdsdb-module-private-samba.so
 
 ### USERSHARES
 %files usershares
diff --git a/tests/deps-check.fmf b/tests/deps-check.fmf
deleted file mode 100644
index c1452d0..0000000
--- a/tests/deps-check.fmf
+++ /dev/null
@@ -1,22 +0,0 @@
-summary: Check samba package dependency structure
-description: |
-    Verify that samba library packages maintain correct dependency hierarchy:
-    - samba-core-libs has no samba-*-libs dependencies
-    - samba-ndr-libs depends on samba-core-libs (not samba-client-libs or samba-libs)
-    - samba-client-libs depends on core-libs + ndr-libs (not samba-libs)
-    - samba-client depends on samba-client-libs (not samba-libs)
-    - samba-libs does not depend on samba-dc-libs
-    - libsmbclient depends on samba-client-libs (not samba-libs)
-    - libwbclient has no samba-*-libs dependencies
-    - libldb has no samba-*-libs dependencies
-test: ./deps-check.sh
-framework: shell
-require:
-  - samba-core-libs
-  - samba-ndr-libs
-  - samba-client-libs
-  - samba-libs
-  - samba-client
-  - libwbclient
-  - libsmbclient
-  - libldb
diff --git a/tests/deps-check.sh b/tests/deps-check.sh
deleted file mode 100755
index ce49074..0000000
--- a/tests/deps-check.sh
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/bash
-#
-# Samba package dependency structure verification
-#
-# This test ensures that the samba library package dependencies don't regress.
-# The expected hierarchy is:
-#
-#   samba-core-libs    (no samba-*-libs dependencies)
-#        ^
-#        |
-#   samba-ndr-libs     (depends on samba-core-libs only)
-#        ^
-#        |
-#   samba-client-libs  (depends on samba-core-libs + samba-ndr-libs)
-#
-#   libwbclient        (no samba-*-libs dependencies - only links to libc)
-#
-#   samba-client       (depends on samba-client-libs, NOT samba-libs)
-#   libsmbclient       (depends on samba-client-libs, NOT samba-libs)
-#
-# NOTE: This test checks RESOLVED dependencies, not just explicit Requires.
-# A library requirement like 'libfoo.so' is resolved to the package that
-# provides it, ensuring we catch indirect dependencies.
-#
-
-set -e
-
-ERRORS=0
-
-# Get all packages that a package depends on (resolved)
-# This resolves library deps like 'libfoo.so' to actual package names
-get_resolved_deps() {
-    local pkg="$1"
-
-    rpm --query --requires "$pkg" 2>/dev/null | while read -r req; do
-        # Skip rpmlib and config requirements
-        [[ "$req" =~ ^rpmlib ]] && continue
-        [[ "$req" =~ ^config ]] && continue
-        [[ "$req" =~ ^/ ]] && continue
-
-        # Get the package that provides this requirement
-        provider=$(rpm --query --whatprovides "$req" 2>/dev/null | head -1)
-        if [ -n "$provider" ] && [ "$provider" != "no package provides $req" ]; then
-            # Extract just the package name (remove version-release.arch)
-            echo "${provider%%-[0-9]*}"
-        fi
-    done | sort -u
-}
-
-# Check that a package does NOT depend on packages matching a pattern
-# This checks RESOLVED dependencies (what packages actually get pulled in)
-check_no_resolved_dep() {
-    local pkg="$1"
-    local pattern="$2"
-    local description="$3"
-
-    if ! rpm --query "$pkg" &>/dev/null; then
-        echo "SKIP: $pkg not installed"
-        return 0
-    fi
-
-    local bad_deps
-    # Exclude the package itself from the check
-    bad_deps=$(get_resolved_deps "$pkg" | grep -v "^${pkg}$" | grep -E "$pattern" || true)
-
-    if [ -n "$bad_deps" ]; then
-        echo "FAIL: $pkg depends on $description"
-        echo "  Found: $bad_deps"
-        ERRORS=$((ERRORS + 1))
-        return 1
-    fi
-    echo "PASS: $pkg does not depend on $description"
-    return 0
-}
-
-# Check that a package DOES depend on a specific package
-check_has_resolved_dep() {
-    local pkg="$1"
-    local expected="$2"
-
-    if ! rpm --query "$pkg" &>/dev/null; then
-        echo "SKIP: $pkg not installed"
-        return 0
-    fi
-
-    if get_resolved_deps "$pkg" | grep -qF "$expected"; then
-        echo "PASS: $pkg depends on $expected"
-        return 0
-    fi
-    echo "FAIL: $pkg does not depend on $expected"
-    ERRORS=$((ERRORS + 1))
-    return 1
-}
-
-echo "=== Samba Package Dependency Checks ==="
-echo ""
-echo "Checking resolved dependencies (library deps resolved to packages)"
-echo ""
-
-# 1. samba-core-libs must NOT depend on any samba-*-libs packages
-echo "--- samba-core-libs ---"
-check_no_resolved_dep samba-core-libs "^samba-.*-libs$" "any samba*-libs package"
-
-echo ""
-
-# 2. samba-ndr-libs must depend on samba-core-libs
-#    but NOT samba-client-libs or samba-libs
-echo "--- samba-ndr-libs ---"
-check_has_resolved_dep samba-ndr-libs "samba-core-libs"
-check_no_resolved_dep samba-ndr-libs "^samba-client-libs$" "samba-client-libs"
-check_no_resolved_dep samba-ndr-libs "^samba-libs$" "samba-libs"
-
-echo ""
-
-# 3. samba-client-libs must depend on samba-core-libs and samba-ndr-libs
-#    but NOT samba-libs
-echo "--- samba-client-libs ---"
-check_has_resolved_dep samba-client-libs "samba-core-libs"
-check_has_resolved_dep samba-client-libs "samba-ndr-libs"
-check_no_resolved_dep samba-client-libs "^samba-libs$" "samba-libs"
-
-echo ""
-
-# 4. libwbclient must NOT depend on any samba-*-libs packages
-echo "--- libwbclient ---"
-check_no_resolved_dep libwbclient "^samba-.*-libs$" "any samba*-libs package"
-
-echo ""
-
-# 5. samba-client must depend on samba-client-libs but NOT samba-libs
-#    (client tools should not pull in server libraries)
-echo "--- samba-client ---"
-check_has_resolved_dep samba-client "samba-client-libs"
-check_no_resolved_dep samba-client "^samba-libs$" "samba-libs"
-
-echo ""
-
-# 6. libsmbclient must depend on samba-client-libs but NOT samba-libs
-#    (SMB client library should not pull in server libraries)
-echo "--- libsmbclient ---"
-check_has_resolved_dep libsmbclient "samba-client-libs"
-check_no_resolved_dep libsmbclient "^samba-libs$" "samba-libs"
-
-echo ""
-
-# 7. libldb must NOT depend on any samba-*-libs packages
-#    (libldb is a standalone database library)
-echo "--- libldb ---"
-check_no_resolved_dep libldb "^samba-.*-libs$" "any samba*-libs package"
-
-echo ""
-
-# 8. samba-libs must NOT depend on samba-dc-libs
-#    (server libraries should not pull in DC-specific libraries)
-echo "--- samba-libs ---"
-check_no_resolved_dep samba-libs "^samba-dc-libs$" "samba-dc-libs"
-
-echo ""
-echo "=== Summary ==="
-
-if [ $ERRORS -gt 0 ]; then
-    echo "FAILED: $ERRORS dependency check(s) failed"
-    exit 1
-fi
-
-echo "All dependency checks passed"
-exit 0