From 02b362fb85838f8b55f8b518ceca2c03bc295c2c Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Thu, 18 Feb 2021 13:51:36 +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#83436d8564d89b55ac9238adcfe6a8aa58861e09 --- .gitignore | 2 ++ samba.spec | 10 +++++++++- sources | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c74b20e..1668ffb 100644 --- a/.gitignore +++ b/.gitignore @@ -235,3 +235,5 @@ samba-3.6.0pre1.tar.gz /samba-4.14.0rc1.tar.asc /samba-4.14.0rc2.tar.xz /samba-4.14.0rc2.tar.asc +/samba-4.14.0rc3.tar.xz +/samba-4.14.0rc3.tar.asc diff --git a/samba.spec b/samba.spec index 5f6927d..373e69d 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 rc2 +%global pre_release rc3 %global samba_release %{main_release}%{?dist} %if "x%{?pre_release}" != "x" @@ -287,6 +287,7 @@ BuildRequires: liburing-devel >= 0.4 # Add python3-iso8601 to avoid that the # version in Samba is being packaged BuildRequires: python3-iso8601 +BuildRequires: python3-pyasn1 BuildRequires: bind BuildRequires: krb5-server >= %{required_mit_krb5} @@ -433,8 +434,10 @@ Requires: %{name}-dc-provision = %{samba_depver} Requires: %{name}-dc-libs = %{samba_depver} Requires: %{name}-winbind = %{samba_depver} +%if %{with libwbclient} Requires(post): libwbclient = %{samba_depver} Requires: libwbclient = %{samba_depver} +%endif # samba-tool needs tdbbackup Requires: tdb-tools @@ -743,8 +746,10 @@ Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} Requires: %{name}-winbind-modules = %{samba_depver} +%if %{with libwbclient} Requires(post): libwbclient = %{samba_depver} Requires: libwbclient = %{samba_depver} +%endif Provides: samba4-winbind = %{samba_depver} Obsoletes: samba4-winbind < %{samba_depver} @@ -3834,6 +3839,9 @@ fi %endif %changelog +* Thu Feb 18 2021 Guenther Deschner - 4.14.0rc3-0 +- Update to Samba 4.14.0rc3 + * Thu Feb 04 2021 Guenther Deschner - 4.14.0rc2-0 - Update to Samba 4.14.0rc2 diff --git a/sources b/sources index 2f38afc..19aab9f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.14.0rc2.tar.xz) = 7dd006538ef2d386dc60949bc23a25ff731a0fb4ec4a078500a27b7ea8352b6b5b7c306e0592007d6e79a13da1bfc201ed34c57df6bf2fda3484e5053f13a6e2 -SHA512 (samba-4.14.0rc2.tar.asc) = 104ac6e7ddb341f12432bb3686a80460fe67523a19f9eb058da112eafe0411839ea73510ad964d5f0a3da1d0372d716593fb68a9cc1ae7e7af5e7457417b2d24 +SHA512 (samba-4.14.0rc3.tar.xz) = 5f99e61d87f742850018d4bbed8d7dfd058f3f6b7db068d384680e6ded9fa63b9c1505f918d4e71dcf5d6ff516078346bc24c5ede8078ebec4f05032fb988edd +SHA512 (samba-4.14.0rc3.tar.asc) = 6565849b11918d7d8f0ccc809d862f579ab69a645f8ba6fc26c1e3fc446199874400240a1a5ccf0bd310394e49e6730d033673c6281d23b84fb661243e98ff08