PR#21: Few missing fixes - rpms/samba

Anoop C S • 2 years ago

6410d15

Anoop C S • 2 years ago

cffce0e

samba.spec

file modified

+4 -4

		`@@ -119,7 +119,7 @@`

		`%define samba_requires_eq() %(LC_ALL="C" echo '%*' \| xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' \| sed -e 's/ (none):/ /' -e 's/ 0:/ /' \| grep -v "is not")`

		`- %global baserelease 5`
		`+ %global baserelease 6`

		`%global samba_version 4.15.0`
		`%global talloc_version 2.3.3`
		`@@ -1210,8 +1210,6 @@`
		`%{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 \`
		`@@ -1988,7 +1986,6 @@`
		`%endif`

		`%{_libdir}/libdcerpc-server.so.*`
		`- %{_libdir}/samba/libdnsserver-common-samba4.so`
		`%{_libdir}/samba/libdsdb-module-samba4.so`
		`%{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so`
		`%{_libdir}/samba/libscavenge-dns-records-samba4.so`
		`@@ -4009,6 +4006,9 @@`
		`%endif`

		`%changelog`
		`+ * Mon Aug 16 2021 Anoop C S <anoopcs@samba.org> - 4.15.0-0.6.rc2`
		`+ - Avoid removing PyDSDB library files from buildroot for non AD DC build`
		`+`
		`* Fri Aug 13 2021 Adam Williamson <awilliam@redhat.com> - 4.15.0-0.5.rc2`
		`- Fix samba-common-tools dependency`

We only have to package libdnsserver-common-samba4.so once and is currently listed inside samba-libs. Therefore removing it from samba-dc-libs as it has Requires for samba-libs
Commit 68140d4 forgot to take out PyDSDB library files from the list of files that are to be removed from buildroot. So reverting cc8c80c to avoid removing it from buildroot in a non AD DC environment.