PR#19: Fix ELN build for non AD DC environment - rpms/samba

rpms / samba

#19 Fix ELN build for non AD DC environment

Merged 2 years ago by asn. Opened 2 years ago by anoopcs.

rpms/ anoopcs/samba main into main

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

Anoop C S • 2 years ago

db523c3

Exclude PyDSDB library files

Anoop C S • 2 years ago

cc8c80c

samba.spec

file modified

+4 -3

		`@@ -1193,7 +1193,6 @@`
		`%{_libdir}/samba/libscavenge-dns-records-samba4.so \`
		`%{_mandir}/man8/samba.8 \`
		`%{_mandir}/man8/samba_downgrade_db.8 \`
		`- %{_mandir}/man8/samba-tool.8 \`
		`%{_mandir}/man8/samba-gpupdate.8 \`
		`%{_libdir}/samba/ldb/ildap.so \`
		`%{_libdir}/samba/ldb/ldbsamba_extensions.so \`
		`@@ -1201,6 +1200,8 @@`
		`%{python3_sitearch}/samba/dcerpc/dnsserver.*.so \`
		`%{python3_sitearch}/samba/dnsserver.py \`
		`%{python3_sitearch}/samba/domain_update.py \`
		`+ %{python3_sitearch}/samba/dsdb.*.so`
		`+ %{python3_sitearch}/samba/dsdb_dns.*.so`
		`%{python3_sitearch}/samba/forest_update.py \`
		`%{python3_sitearch}/samba/kcc/__init__.py \`
		`%{python3_sitearch}/samba/kcc/debug.py \`
		`@@ -1852,6 +1853,7 @@`
		`%{_bindir}/net`
		`%{_bindir}/pdbedit`
		`%{_bindir}/profiles`
		`+ %{_bindir}/samba-tool`
		`%{_bindir}/smbcontrol`
		`%{_bindir}/smbpasswd`
		`%{_bindir}/testparm`
		`@@ -1860,13 +1862,13 @@`
		`%{_mandir}/man1/testparm.1*`
		`%{_mandir}/man8/net.8*`
		`%{_mandir}/man8/pdbedit.8*`
		`+ %{_mandir}/man8/samba-tool.8*`
		`%{_mandir}/man8/smbpasswd.8*`

		`### DC`
		`%if %{with dc} \|\| %{with testsuite}`
		`%files dc`
		`%{_unitdir}/samba.service`
		`- %{_bindir}/samba-tool`
		`%{_sbindir}/samba`
		`%{_sbindir}/samba_dnsupdate`
		`%{_sbindir}/samba_downgrade_db`
		`@@ -1934,7 +1936,6 @@`
		`%{_mandir}/man8/samba.8*`
		`%{_mandir}/man8/samba_downgrade_db.8*`
		`%{_mandir}/man8/samba-gpupdate.8*`
		`- %{_mandir}/man8/samba-tool.8*`
		`%dir %{_datadir}/samba/admx`
		`%{_datadir}/samba/admx/samba.admx`
		`%dir %{_datadir}/samba/admx/en-US`

anoopcs commented 2 years ago

PyDSDB and samba-tool utility are now built in a non AD DC environment. Therefore we need to handle(include/exclude) the following files in our sub-packages:

/usr/lib64/python3.9/site-packages/samba/dsdb.cpython-39-x86_64-linux-gnu.so
/usr/lib64/python3.9/site-packages/samba/dsdb_dns.cpython-39-x86_64-linux-gnu.so
/usr/bin/samba-tool

resolves: #1991353