From f330fa50e6bbfda9564c90cb881a31f049eb0e4b Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sat, 6 Feb 2021 19:47:58 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/samba.git#e267c837dc2a3935d7eec67ac07067268e051e2d --- .gitignore | 2 ++ samba.spec | 12 +++++++++++- sources | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3e7538e..c74b20e 100644 --- a/.gitignore +++ b/.gitignore @@ -233,3 +233,5 @@ samba-3.6.0pre1.tar.gz /samba-4.13.4.tar.asc /samba-4.14.0rc1.tar.xz /samba-4.14.0rc1.tar.asc +/samba-4.14.0rc2.tar.xz +/samba-4.14.0rc2.tar.asc diff --git a/samba.spec b/samba.spec index 47d165a..5f6927d 100644 --- a/samba.spec +++ b/samba.spec @@ -116,7 +116,7 @@ %global tevent_version 0.10.2 %global ldb_version 2.2.0 # This should be rc1 or nil -%global pre_release rc1 +%global pre_release rc2 %global samba_release %{main_release}%{?dist} %if "x%{?pre_release}" != "x" @@ -190,6 +190,7 @@ Requires: %{name}-common-tools = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} %if %{with libwbclient} +Requires(post): libwbclient = %{samba_depver} Requires: libwbclient = %{samba_depver} %endif @@ -431,6 +432,10 @@ Requires: %{name}-libs = %{samba_depver} Requires: %{name}-dc-provision = %{samba_depver} Requires: %{name}-dc-libs = %{samba_depver} Requires: %{name}-winbind = %{samba_depver} + +Requires(post): libwbclient = %{samba_depver} +Requires: libwbclient = %{samba_depver} + # samba-tool needs tdbbackup Requires: tdb-tools # samba-tool needs mdb_copy @@ -737,6 +742,8 @@ Requires: %{name}-common-tools = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} Requires: %{name}-winbind-modules = %{samba_depver} + +Requires(post): libwbclient = %{samba_depver} Requires: libwbclient = %{samba_depver} Provides: samba4-winbind = %{samba_depver} @@ -3827,6 +3834,9 @@ fi %endif %changelog +* Thu Feb 04 2021 Guenther Deschner - 4.14.0rc2-0 +- Update to Samba 4.14.0rc2 + * Wed Jan 27 2021 Guenther Deschner - 4.14.0rc1-0 - Update to Samba 4.14.0rc1 diff --git a/sources b/sources index 11873bc..2f38afc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.14.0rc1.tar.xz) = 1ae0401be3fbad6f46b3216649b7c00671136554bfa672fd01f5027ca3babb4fb7019863414fd7a49d443b8f5a913d4fb645ccf8df2d1aceb7214323ea66f87b -SHA512 (samba-4.14.0rc1.tar.asc) = f876da3c00418ec2b612b52354a8bfd1544984d5dd69752f18ec78d0b30243ea6c6c976b6ece3988094a986cf8568f440b63eacaee4d8a1e60039d899d21bff3 +SHA512 (samba-4.14.0rc2.tar.xz) = 7dd006538ef2d386dc60949bc23a25ff731a0fb4ec4a078500a27b7ea8352b6b5b7c306e0592007d6e79a13da1bfc201ed34c57df6bf2fda3484e5053f13a6e2 +SHA512 (samba-4.14.0rc2.tar.asc) = 104ac6e7ddb341f12432bb3686a80460fe67523a19f9eb058da112eafe0411839ea73510ad964d5f0a3da1d0372d716593fb68a9cc1ae7e7af5e7457417b2d24