diff --git a/.gitignore b/.gitignore
index a041f4d..f89096c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/ldb-1.5.4.tar.gz
+SOURCES/ldb-2.0.7.tar.gz
diff --git a/.libldb.metadata b/.libldb.metadata
index 33655e6..bbbfa05 100644
--- a/.libldb.metadata
+++ b/.libldb.metadata
@@ -1 +1 @@
-870e4112053ae350f5de27b00aa8703d3e7dc34d SOURCES/ldb-1.5.4.tar.gz
+f80b43fd7461fccfd14d9f81eb83c3bd1543940f SOURCES/ldb-2.0.7.tar.gz
diff --git a/SOURCES/cmocka-relax-minimal-version.patch b/SOURCES/cmocka-relax-minimal-version.patch
deleted file mode 100644
index 556ac90..0000000
--- a/SOURCES/cmocka-relax-minimal-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ldb-1.6.2/buildtools/wafsamba/samba_third_party.py.cmocka ldb-1.6.2/buildtools/wafsamba/samba_third_party.py
---- ldb-1.6.2/buildtools/wafsamba/samba_third_party.py.cmocka 2019-05-02 18:19:48.491709659 +0200
-+++ ldb-1.6.2/buildtools/wafsamba/samba_third_party.py 2019-05-02 18:20:03.703762725 +0200
-@@ -36,7 +36,7 @@ Build.BuildContext.CHECK_POPT = CHECK_PO
-
- @conf
- def CHECK_CMOCKA(conf):
-- return conf.CHECK_BUNDLED_SYSTEM_PKG('cmocka', minversion='1.1.3')
-+ return conf.CHECK_BUNDLED_SYSTEM_PKG('cmocka', minversion='1.1.2')
-
- Build.BuildContext.CHECK_CMOCKA = CHECK_CMOCKA
-
diff --git a/SPECS/libldb.spec b/SPECS/libldb.spec
index 7580a6c..594277f 100644
--- a/SPECS/libldb.spec
+++ b/SPECS/libldb.spec
@@ -1,10 +1,10 @@
-%global talloc_version 2.1.16
-%global tdb_version 1.3.18
-%global tevent_version 0.9.39
+%global talloc_version 2.2.0
+%global tdb_version 1.4.2
+%global tevent_version 0.10.0
Name: libldb
-Version: 1.5.4
-Release: 2%{?dist}
+Version: 2.0.7
+Release: 3%{?dist}
Summary: A schema-less, ldap like, API and database
Requires: libtalloc%{?_isa} >= %{talloc_version}
Requires: libtdb%{?_isa} >= %{tdb_version}
@@ -41,7 +41,6 @@ Obsoletes: python2-ldb-devel < %{version}-%{release}
Obsoletes: python2-ldb-debuginfo < %{version}-%{release}
# Patches
-Patch0001: cmocka-relax-minimal-version.patch
%description
An extensible library that implements an LDAP like API to access remote LDAP
@@ -86,8 +85,7 @@ Obsoletes: python-ldb-devel-common < %{version}-%{release}
Development files for the Python bindings for the LDB library
%prep
-%setup -q -n ldb-%{version}
-%patch0001 -p1
+%autosetup -n ldb-%{version} -p1
%build
%configure --disable-rpath \
@@ -167,7 +165,7 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
%files -n python3-ldb
%{python3_sitearch}/ldb.cpython-*.so
-%{_libdir}/libpyldb-util.cpython-*.so.1*
+%{_libdir}/libpyldb-util.cpython-*.so.*
%{python3_sitearch}/_ldb_text.py
%{python3_sitearch}/__pycache__/_ldb_text.cpython-*.py*
@@ -180,6 +178,10 @@ rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/_*
%ldconfig_scriptlets -n python3-ldb
%changelog
+* Tue Nov 26 2019 Isaac Boukris <iboukris@redhat.com> - 2.0.7-3
+- Resolves: rhbz#1754423 - Rebase libldb to 2.0.7 version for samba
+- Related: rhbz#1754423 - Fix sssd tests (ldb)
+
* Tue May 7 2019 Jakub Hrozek <jhrozek@redhat.com> - 1.5.4-2
- Fix some python2-related upgrade issues
- Related: rhbz#1567115 - libldb: Drop Python 2 subpackages from RHEL 8