Move samba-tool from samba-dc to samba-common-tools sub-package

samba-tool is now built in a non AD DC environment and has been improved
to prevent crashes due to import errors. See the following commits in
upstream:

* https://git.samba.org/?p=samba.git;a=commit;h=779d0f02718b3812024bafcd5477ec3039c7a0cf
* https://git.samba.org/?p=samba.git;a=commit;h=fb5fe30e824d2d511188053ce04cf797b769727a
* https://git.samba.org/?p=samba.git;a=commit;h=f241fe5d46e8dd2b3265be7eddbd6686a6f920db
* https://git.samba.org/?p=samba.git;a=commit;h=a45ea91cd7e8335319c96ea5bda02014f584df63

related: #1991353
This commit is contained in:
Anoop C S 2021-08-11 11:26:39 +05:30
parent cc8c80c04b
commit db523c32da

View File

@ -1193,7 +1193,6 @@ for i in \
%{_libdir}/samba/libscavenge-dns-records-samba4.so \ %{_libdir}/samba/libscavenge-dns-records-samba4.so \
%{_mandir}/man8/samba.8 \ %{_mandir}/man8/samba.8 \
%{_mandir}/man8/samba_downgrade_db.8 \ %{_mandir}/man8/samba_downgrade_db.8 \
%{_mandir}/man8/samba-tool.8 \
%{_mandir}/man8/samba-gpupdate.8 \ %{_mandir}/man8/samba-gpupdate.8 \
%{_libdir}/samba/ldb/ildap.so \ %{_libdir}/samba/ldb/ildap.so \
%{_libdir}/samba/ldb/ldbsamba_extensions.so \ %{_libdir}/samba/ldb/ldbsamba_extensions.so \
@ -1854,6 +1853,7 @@ fi
%{_bindir}/net %{_bindir}/net
%{_bindir}/pdbedit %{_bindir}/pdbedit
%{_bindir}/profiles %{_bindir}/profiles
%{_bindir}/samba-tool
%{_bindir}/smbcontrol %{_bindir}/smbcontrol
%{_bindir}/smbpasswd %{_bindir}/smbpasswd
%{_bindir}/testparm %{_bindir}/testparm
@ -1862,13 +1862,13 @@ fi
%{_mandir}/man1/testparm.1* %{_mandir}/man1/testparm.1*
%{_mandir}/man8/net.8* %{_mandir}/man8/net.8*
%{_mandir}/man8/pdbedit.8* %{_mandir}/man8/pdbedit.8*
%{_mandir}/man8/samba-tool.8*
%{_mandir}/man8/smbpasswd.8* %{_mandir}/man8/smbpasswd.8*
### DC ### DC
%if %{with dc} || %{with testsuite} %if %{with dc} || %{with testsuite}
%files dc %files dc
%{_unitdir}/samba.service %{_unitdir}/samba.service
%{_bindir}/samba-tool
%{_sbindir}/samba %{_sbindir}/samba
%{_sbindir}/samba_dnsupdate %{_sbindir}/samba_dnsupdate
%{_sbindir}/samba_downgrade_db %{_sbindir}/samba_downgrade_db
@ -1936,7 +1936,6 @@ fi
%{_mandir}/man8/samba.8* %{_mandir}/man8/samba.8*
%{_mandir}/man8/samba_downgrade_db.8* %{_mandir}/man8/samba_downgrade_db.8*
%{_mandir}/man8/samba-gpupdate.8* %{_mandir}/man8/samba-gpupdate.8*
%{_mandir}/man8/samba-tool.8*
%dir %{_datadir}/samba/admx %dir %{_datadir}/samba/admx
%{_datadir}/samba/admx/samba.admx %{_datadir}/samba/admx/samba.admx
%dir %{_datadir}/samba/admx/en-US %dir %{_datadir}/samba/admx/en-US