From 252d7672c01e7e8a4a60a13ce35a963d3a6bce8f Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Fri, 12 Mar 2021 22:52:12 +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#f931b17773ce7c2cbf6553618b4af4af0730dd65 --- .gitignore | 4 ++++ samba.spec | 14 ++++++++++++-- sources | 4 ++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1668ffb..d616a91 100644 --- a/.gitignore +++ b/.gitignore @@ -237,3 +237,7 @@ samba-3.6.0pre1.tar.gz /samba-4.14.0rc2.tar.asc /samba-4.14.0rc3.tar.xz /samba-4.14.0rc3.tar.asc +/samba-4.14.0rc4.tar.xz +/samba-4.14.0rc4.tar.asc +/samba-4.14.0.tar.xz +/samba-4.14.0.tar.asc diff --git a/samba.spec b/samba.spec index 373e69d..77e355a 100644 --- a/samba.spec +++ b/samba.spec @@ -108,7 +108,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 main_release 0 +%global main_release 1 %global samba_version 4.14.0 %global talloc_version 2.3.2 @@ -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 rc3 +%global pre_release %nil %global samba_release %{main_release}%{?dist} %if "x%{?pre_release}" != "x" @@ -3839,6 +3839,16 @@ fi %endif %changelog +* Tue Mar 09 2021 Guenther Deschner - 4.14.0-3 +- Update to Samba 4.14.0 + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2:4.14.0-0.0.rc4.2 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Mon Mar 01 2021 Guenther Deschner - 4.14.0rc4-0 +- Update to Samba 4.14.0rc4 + * Thu Feb 18 2021 Guenther Deschner - 4.14.0rc3-0 - Update to Samba 4.14.0rc3 diff --git a/sources b/sources index 19aab9f..e353852 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.14.0rc3.tar.xz) = 5f99e61d87f742850018d4bbed8d7dfd058f3f6b7db068d384680e6ded9fa63b9c1505f918d4e71dcf5d6ff516078346bc24c5ede8078ebec4f05032fb988edd -SHA512 (samba-4.14.0rc3.tar.asc) = 6565849b11918d7d8f0ccc809d862f579ab69a645f8ba6fc26c1e3fc446199874400240a1a5ccf0bd310394e49e6730d033673c6281d23b84fb661243e98ff08 +SHA512 (samba-4.14.0.tar.xz) = 0f8e5d6e404769b37562ab7660e9829139e4cdea6288a7ff93f244e5dd02d2b35659321cc5dfd38f3b3e55e7c044626397ef959e3887e32cc9dc70ad8061d1d3 +SHA512 (samba-4.14.0.tar.asc) = 701e6df132549d7f627fb08ff187d448382a657f332c9d0368c53f0583287712537f5f510a8c7a6b5cd20e7ee2cae210c3f789704b47095a27bbaedbff29d992