diff --git a/samba.spec b/samba.spec index d9fa96e..d529891 100644 --- a/samba.spec +++ b/samba.spec @@ -1,6 +1,6 @@ Name: samba -Version: 4.20.4 -Release: 1mamba +Version: 4.21.0 +Release: 2mamba Summary: Samba provides seamless file and print services to SMB/CIFS clients Group: System/Servers Vendor: openmamba @@ -29,7 +29,7 @@ BuildRequires: libgpgme-devel BuildRequires: libicu-devel BuildRequires: libjansson-devel BuildRequires: libkeyutils-devel -BuildRequires: libldb-devel +BuildRequires: liblmdb-devel BuildRequires: liblttng-ust-devel BuildRequires: libncurses-devel BuildRequires: libnscd-devel @@ -51,9 +51,6 @@ BuildRequires: setup ## AUTOBUILDREQ-END BuildRequires: libopenssl-devel BuildRequires: python-dnspython-py3 -BuildRequires: python-ldb >= 1:2.8.0-2mamba -BuildRequires: python-ldb -BuildRequires: python-tdb BuildRequires: python-tevent BuildRequires: perl-Parse-Yapp BuildRequires: valgrind @@ -64,11 +61,10 @@ Requires(pre): setup Requires(post):libwbclient = %{?epoch:%epoch:}%{version}-%{release} Requires(post):lib%{name} = %{?epoch:%epoch:}%{version}-%{release} Requires: cifs-utils -Requires: python-ldb -Requires: python-tdb Requires: python-tevent Requires: python-dnspython-py3 Obsoletes: samba-common < 4.14.4 +Obsoletes: ldb <= 1:2.9.1-1mamba %systemd_requires %description @@ -96,6 +92,7 @@ This package contains the Samba 4 server files. %package -n lib%{name} Group: System/Libraries Summary: Samba 4 libraries +Obsoletes: libldb <= 1:2.9.1-1mamba %description -n lib%{name} Samba provides seamless file and print services to SMB/CIFS clients. @@ -105,6 +102,7 @@ This package contains Samba 4 library files. Group: Development/Libraries Summary: Devel Samba 4 server files Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} +Obsoletes: libldb-devel <= 1:2.9.1-1mamba %description -n lib%{name}-devel Samba provides seamless file and print services to SMB/CIFS clients. @@ -245,7 +243,8 @@ PATH=/usr/bin:$PATH \ --systemd-install-services \ --with-systemddir=%{_unitdir} \ --enable-cups \ - --bundled-libraries=!tdb,!talloc,!pytalloc-util,!tevent,!popt,!ldb,!pyldb-util \ + --private-libraries='!ldb' \ + --bundled-libraries=!tdb,!talloc,!pytalloc-util,!tevent,!popt,!pyldb-util \ --systemd-nmb-extra "TimeoutStartSec=300" \ %ifarch arm --with-experimental-mit-ad-dc \ @@ -395,22 +394,6 @@ fi %systemd_postun samba : - -%post -n libsamba -p /sbin/ldconfig -%postun -n libsamba -p /sbin/ldconfig - -%post -n libsmbclient -p /sbin/ldconfig -%postun -n libsmbclient -p /sbin/ldconfig - -%post -n libsmbsharemodes -p /sbin/ldconfig -%postun -n libsmbsharemodes -p /sbin/ldconfig - -%post -n libnetapi -p /sbin/ldconfig -%postun -n libnetapi -p /sbin/ldconfig - -%post -n libwbclient -p /sbin/ldconfig -%postun -n libwbclient -p /sbin/ldconfig - %files %defattr(-,root,root) %config %dir %{_sysconfdir}/samba @@ -418,6 +401,7 @@ fi %attr(664,root,filesharing) %config(noreplace) %{_sysconfdir}/samba/smb.conf %attr(644,root,root) %{_sysconfdir}/openldap/schema/samba.schema %{_bindir}/dumpmscat +%{_bindir}/ldb* %{_bindir}/mdsearch %{_bindir}/mvxattr %{_bindir}/net @@ -471,21 +455,13 @@ fi %files -n lib%{name} %defattr(-,root,root) -%{_libdir}/libdcerpc-binding.so.* -%{_libdir}/libdcerpc-server.so.* -%{_libdir}/libdcerpc-server-core.so.* -%{_libdir}/libdcerpc.so.* -%{_libdir}/libdcerpc-samr.so.* +%{_libdir}/libdcerpc*.so.* +%{_libdir}/libldb.so.* %{_libdir}/libndr-krb5pac.so.* %{_libdir}/libndr-nbt.so.* %{_libdir}/libndr-standard.so.* %{_libdir}/libndr.so.* -%{_libdir}/libsamba-credentials.so.* -%{_libdir}/libsamba-errors.so.* -%{_libdir}/libsamba-hostconfig.so.* -%{_libdir}/libsamba-passdb.so.* -%{_libdir}/libsamba-policy.cpython-*.so.* -%{_libdir}/libsamba-util.so.* +%{_libdir}/libsamba-*.so.* %{_libdir}/libsamdb.so.* %{_libdir}/libsmbconf.so.* %{_libdir}/libsmbldap.so.* @@ -497,6 +473,8 @@ fi %{_libexecdir}/samba/rpcd_* %{_libexecdir}/samba/samba-bgqd %{_libexecdir}/samba/samba-dcerpcd +%{python3_sitearch}/_ldb_text.py +%{python3_sitearch}/ldb.cpython-*.so %files -n lib%{name}-devel %defattr(-,root,root) @@ -506,37 +484,27 @@ fi %exclude %{_includedir}/samba-4.0/netapi.h %exclude %{_includedir}/samba-4.0/wbclient.h %{_libdir}/libdcerpc-binding.so -%{_libdir}/libdcerpc-samr.so -%{_libdir}/libdcerpc-server.so -%{_libdir}/libdcerpc-server-core.so -%{_libdir}/libdcerpc.so +%{_libdir}/libdcerpc*.so +%{_libdir}/libldb.so %{_libdir}/libndr-krb5pac.so %{_libdir}/libndr-nbt.so %{_libdir}/libndr-standard.so %{_libdir}/libndr.so -%{_libdir}/libsamba-credentials.so -%{_libdir}/libsamba-errors.so -%{_libdir}/libsamba-hostconfig.so -%{_libdir}/libsamba-passdb.so -%{_libdir}/libsamba-policy.cpython-*.so -%{_libdir}/libsamba-util.so +%{_libdir}/libsamba-*.so %{_libdir}/libsamdb.so %{_libdir}/libsmbconf.so %{_libdir}/libsmbldap.so %{_libdir}/libtevent-util.so -%{_libdir}/pkgconfig/dcerpc.pc -%{_libdir}/pkgconfig/dcerpc_samr.pc -%{_libdir}/pkgconfig/dcerpc_server.pc +%{_libexecdir}/samba/smbspool_krb5_wrapper +%{_libdir}/pkgconfig/dcerpc*.pc +%{_libdir}/pkgconfig/ldb.pc %{_libdir}/pkgconfig/ndr.pc %{_libdir}/pkgconfig/ndr_krb5pac.pc %{_libdir}/pkgconfig/ndr_nbt.pc %{_libdir}/pkgconfig/ndr_standard.pc -%{_libdir}/pkgconfig/samba-credentials.pc -%{_libdir}/pkgconfig/samba-hostconfig.pc -%{_libdir}/pkgconfig/samba-policy.cpython-*.pc -%{_libdir}/pkgconfig/samba-util.pc +%{_libdir}/pkgconfig/samba-*.pc %{_libdir}/pkgconfig/samdb.pc -%{_libexecdir}/samba/smbspool_krb5_wrapper +%{_mandir}/man3/ldb.3.gz %files server %defattr(-,root,root) @@ -646,6 +614,12 @@ fi %{_mandir}/man8/winbindd.* %changelog +* Mon Sep 16 2024 Silvan Calarco 4.21.0-2mamba +- don't require python-ldb from obsolete ldb package + +* Mon Sep 09 2024 Automatic Build System 4.21.0-1mamba +- automatic version update by autodist + * Tue Aug 06 2024 Automatic Build System 4.20.4-1mamba - automatic version update by autodist