diff --git a/1420.patch b/1420.patch deleted file mode 100644 index c2199ef..0000000 --- a/1420.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0e4fd77c1e03fe6351d129f2161b0b3313f5fa3d Mon Sep 17 00:00:00 2001 -From: Mathieu Parent -Date: Thu, 25 Jun 2020 09:48:04 +0200 -Subject: [PATCH] Fix FTBFS / Increase the over-estimation for sparse files - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=14418 -Signed-off-by: Mathieu Parent ---- - tests/ldb_kv_ops_test.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/lib/ldb/tests/ldb_kv_ops_test.c b/lib/ldb/tests/ldb_kv_ops_test.c -index 30adebf1952..9db2212895f 100644 ---- a/tests/ldb_kv_ops_test.c -+++ b/tests/ldb_kv_ops_test.c -@@ -1717,8 +1717,11 @@ static void test_get_size(void **state) - /* - * The tdb implementation of get_size over estimates for sparse files - * which is perfectly acceptable for it's intended use. -+ * mipsel, ia64: 9994 -+ * ppc64el, powerpc, ppc64: 13369 -+ * sparc64: 5046 - */ -- assert_in_range(size, 2500, 5000); -+ assert_in_range(size, 2500, 15000); - #endif - - /* -@@ -1746,8 +1749,11 @@ static void test_get_size(void **state) - /* - * The tdb implementation of get_size over estimates for sparse files - * which is perfectly acceptable for it's intended use. -+ * mipsel, ia64: 9994 -+ * ppc64el, powerpc, ppc64: 13369 -+ * sparc64: 5046 - */ -- assert_in_range(size, 2500, 5000); -+ assert_in_range(size, 2500, 15000); - #endif - talloc_free(tmp_ctx); - } --- -GitLab - diff --git a/libldb.spec b/libldb.spec index 285c5ce..f9e4380 100644 --- a/libldb.spec +++ b/libldb.spec @@ -24,8 +24,8 @@ %global tevent_version 0.10.2 Name: libldb -Version: 2.2.0 -Release: 8%{?dist} +Version: 2.3.0 +Release: 1%{?dist} Summary: A schema-less, ldap like, API and database Requires: libtalloc%{?_isa} >= %{talloc_version} Requires: libtdb%{?_isa} >= %{tdb_version} @@ -39,8 +39,6 @@ Source2: ldb.keyring # Patches Patch0001: 0001-PATCH-wafsamba-Fix-few-SyntaxWarnings-caused-by-regu.patch -# Fix FTBFS / Increase the over-estimation for sparse files -Patch0002: https://gitlab.com/samba-team/samba/-/merge_requests/1420.patch BuildRequires: gcc BuildRequires: libtalloc-devel >= %{talloc_version} @@ -225,6 +223,9 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_* %endif %changelog +* Wed Mar 24 2021 Lukas Slebodnik - 2.3.0-1 +- libldb-2.3.0 is required for new samba + * Tue Jan 26 2021 Fedora Release Engineering - 2.2.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild