rpms / samba

Clone
Source Code
GIT

#20 Fix inclusion of PyDSDB library files
Merged 2 years ago by asn. Opened 2 years ago by anoopcs.
rpms/ anoopcs/samba main  into  main

file modified
+3 -3 
@@ -1196,7 +1196,6 @@ 
 

  %if %{without dc} && %{without testsuite}
 

  for i in \
 

      %{_libdir}/samba/libdfs-server-ad-samba4.so \
 

-     %{_libdir}/samba/libdnsserver-common-samba4.so \
 

      %{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so \
 

      %{_libdir}/samba/libscavenge-dns-records-samba4.so \
 

      %{_mandir}/man8/samba.8 \
 
@@ -2168,6 +2167,7 @@ 
 

  %{_libdir}/samba/libauth4-samba4.so
 

  %{_libdir}/samba/libauth-unix-token-samba4.so
 

  %{_libdir}/samba/libdcerpc-samba4.so
 

+ %{_libdir}/samba/libdnsserver-common-samba4.so
 

  %{_libdir}/samba/libshares-samba4.so
 

  %{_libdir}/samba/libsmbpasswdparser-samba4.so
 

  %{_libdir}/samba/libxattr-tdb-samba4.so
 
@@ -2350,6 +2350,8 @@ 
 

  %{python3_sitearch}/samba/descriptor.py
 

  %{python3_sitearch}/samba/dnsresolver.py
 

  %{python3_sitearch}/samba/drs_utils.py
 

+ %{python3_sitearch}/samba/dsdb.*.so
 

+ %{python3_sitearch}/samba/dsdb_dns.*.so
 

  %{python3_sitearch}/samba/gensec.*.so
 

  %{python3_sitearch}/samba/getopt.py
 

  %{python3_sitearch}/samba/gpclass.py
 
@@ -2541,8 +2543,6 @@ 
 

  

  %{python3_sitearch}/samba/dcerpc/dnsserver.*.so
 

  %{python3_sitearch}/samba/dckeytab.*.so
 

- %{python3_sitearch}/samba/dsdb.*.so
 

- %{python3_sitearch}/samba/dsdb_dns.*.so
 

  %{python3_sitearch}/samba/domain_update.py
 

  %{python3_sitearch}/samba/forest_update.py
 

  %{python3_sitearch}/samba/ms_forest_updates_markdown.py

Commit cc8c80c removed the following PyDSDB library files from buildroot:

  • /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

This was done under the impression that their dependency on libdnsserver-common-samba4.so was not built in a non AD DC environment. But in reality it was also conditionally removed from the buildroot.

Apart from including PyDSDB back into python3-samba, we avoid removing libdnsserver-common-samba4.so from buildroot and subsequently include it in samba-libs to satisfy all dependencies. Additionally we remove PyDSDB listing from %files section of python3-samba-dc sub-package.

rebased onto 68140d4
2 years ago

Pull-Request has been merged by asn
2 years ago
Metadata
None
No Tags
Changes Summary 1
+3 -3
file changed
samba.spec
Powered by Pagure 5.13.3
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.