From 4dc345bcc2d84356a33a628efa4636d625f5464c Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 17:37:19 +0100 Subject: [PATCH] fix mistake in previous change for libldb check: apply to requirement, not only build-requirement [release 4.8.5-3mamba;Thu Sep 13 2018] --- samba.spec | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/samba.spec b/samba.spec index a8579c2..5473943 100644 --- a/samba.spec +++ b/samba.spec @@ -6,8 +6,8 @@ %define smbldap_tools_ver 0.9.2 Name: samba -Version: 4.8.4 -Release: 1mamba +Version: 4.8.5 +Release: 3mamba Summary: Samba provides seamless file and print services to SMB/CIFS clients Group: System/Servers Vendor: openmamba @@ -51,7 +51,6 @@ BuildRequires: libgamin-devel BuildRequires: libgcrypt-devel BuildRequires: libgnutls-devel BuildRequires: libiniparser-devel -BuildRequires: libldb-devel BuildRequires: libncurses-devel BuildRequires: libopenldap-devel BuildRequires: libpam-devel @@ -73,9 +72,11 @@ BuildRequires: pytalloc-devel BuildRequires: libsystemd-devel >= 2:230-1mamba BuildRequires: libopenssl-devel BuildRequires: valgrind +BuildRequires: libldb-devel < 1:1.4 #BuildRequires: python-tdb Requires: perl Requires: pam >= 0.78-10 +Requires: libldb < 1:1.4 Requires: perl-Unicode-MapUTF8 Requires(pre): setup Requires(post):libwbclient = %{?epoch:%epoch:}%{version}-%{release} @@ -226,14 +227,13 @@ This package contains the winbind daemon and the wbinfo tool. %prep -%setup -q -#-D -T -#:<< _EOF +%setup -q -D -T +:<< _EOF #%patch0 -p1 #%patch1 -p1 %build -#:<< _EOF +:<< _EOF # skip icecc for configure PATH=/usr/bin:$PATH \ @@ -559,8 +559,11 @@ fi %{_bindir}/smbtar %{_bindir}/smbtree %{_bindir}/testparm -%{_libdir}/samba/auth/script.so %dir %{_libdir}/samba +%dir %{_libdir}/samba/auth +%{_libdir}/samba/auth/*.so +%dir %{_libdir}/samba/krb5 +%{_libdir}/samba/krb5/*.so %dir %{_libdir}/samba/idmap %{_libdir}/samba/idmap/*.so %{_libdir}/samba/vfs/* @@ -655,7 +658,7 @@ fi %{_libdir}/pkgconfig/samba-util.pc %{_libdir}/pkgconfig/samdb.pc #%{_libdir}/pkgconfig/torture.pc -%{_libdir}/winbind_krb5_locator.so +#%{_libdir}/winbind_krb5_locator.so %{_libexecdir}/samba/smbspool_krb5_wrapper %files server @@ -798,6 +801,15 @@ fi %{_mandir}/man8/winbindd.* %changelog +* Thu Sep 13 2018 Silvan Calarco 4.8.5-3mamba +- fix mistake in previous change for libldb check: apply to requirement, not only build-requirement + +* Thu Sep 13 2018 Silvan Calarco 4.8.5-2mamba +- add epoch to libldb requirement + +* Tue Sep 11 2018 Automatic Build System 4.8.5-1mamba +- automatic version update by autodist + * Wed Aug 15 2018 Automatic Build System 4.8.4-1mamba - automatic version update by autodist