Create package dc-libs also for 'non-dc' build

This commit is contained in:
Pavel Filipenský 2022-12-22 15:06:03 +01:00
parent f7094aca2e
commit f57b4c25bd
1 changed files with 10 additions and 4 deletions

View File

@ -135,7 +135,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 samba_version 4.17.4
%global baserelease 1
%global baserelease 2
# This should be rc1 or %%nil
%global pre_release %nil
@ -597,6 +597,9 @@ BuildArch: noarch
%description dc-provision
The samba-dc-provision package provides files to setup a domain controller
#endif with dc || with testsuite
%endif
### DC-LIBS
%package dc-libs
Summary: Samba AD Domain Controller Libraries
@ -613,6 +616,7 @@ Provides: bundled(libreplace)
The %{name}-dc-libs package contains the libraries needed by the DC to
link against the SMB, RPC and other protocols.
%if %{with dc} || %{with testsuite}
### DC-BIND
%package dc-bind-dlz
Summary: Bind DLZ module for Samba AD
@ -835,9 +839,7 @@ Summary: Samba Python3 libraries
Requires: %{name}-client-libs = %{samba_depver}
Requires: %{name}-common-libs = %{samba_depver}
Requires: %{name}-libs = %{samba_depver}
%if %{with dc}
Requires: %{name}-dc-libs = %{samba_depver}
%endif
Requires: python3-talloc
Requires: python3-tevent
Requires: python3-tdb
@ -1400,7 +1402,6 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
%if %{without dc} && %{without testsuite}
for i in \
%{_libdir}/samba/libauth4-samba4.so \
%{_libdir}/samba/libdfs-server-ad-samba4.so \
%{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so \
%{_libdir}/samba/libscavenge-dns-records-samba4.so \
@ -2175,9 +2176,13 @@ fi
%license source4/setup/ad-schema/licence.txt
%{_datadir}/samba/setup
#endif with dc || with testsuite
%endif
### DC-LIBS
%files dc-libs
%{_libdir}/samba/libauth4-samba4.so
%if %{with dc} || %{with testsuite}
%{_libdir}/samba/libdb-glue-samba4.so
%{_libdir}/samba/libpac-samba4.so
%{_libdir}/samba/libprocess-model-samba4.so
@ -4338,6 +4343,7 @@ fi
%changelog
* Thu Dec 22 2022 Pavel Filipenský <pfilipen@redhat.com> - 4.17.4-2
- Always add epoch to samba_depver to fix osci.brew-build.rpmdeplint.functional
- Create package dc-libs also for 'non-dc build'
* Tue Dec 20 2022 Pavel Filipenský <pfilipen@redhat.com> - 4.17.4-1
- Fix '--without dc' build: delete libauth4-samba4.so