From 2549a1b85c50f83817386e4350a6841bc7e9c438bb2f3b886ec6b65d39558b7e Mon Sep 17 00:00:00 2001
From: Noel Power <nopower@suse.com>
Date: Thu, 12 May 2022 10:39:25 +0000
Subject: [PATCH] Accepting request 976581 from
 home:scabrero:branches:network:samba:STABLE

- Use requires_eq macro to require the libldb2 version available at
  samba-dsdb-modules build time; (bsc#1199362);

OBS-URL: https://build.opensuse.org/request/show/976581
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=663
---
 samba-4.16.1+git.235.f435da606f7.tar.bz2 |  3 ---
 samba-4.16.1+git.237.1d04c5f421f.tar.bz2 |  3 +++
 samba.changes                            |  6 ++++++
 samba.spec                               | 10 ++++++++--
 4 files changed, 17 insertions(+), 5 deletions(-)
 delete mode 100644 samba-4.16.1+git.235.f435da606f7.tar.bz2
 create mode 100644 samba-4.16.1+git.237.1d04c5f421f.tar.bz2

diff --git a/samba-4.16.1+git.235.f435da606f7.tar.bz2 b/samba-4.16.1+git.235.f435da606f7.tar.bz2
deleted file mode 100644
index 359fedf..0000000
--- a/samba-4.16.1+git.235.f435da606f7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:083d7310f5fb8cf21d6ac2b8ac98014ac439e18b3c8f622d14a704ed8480283e
-size 33994502
diff --git a/samba-4.16.1+git.237.1d04c5f421f.tar.bz2 b/samba-4.16.1+git.237.1d04c5f421f.tar.bz2
new file mode 100644
index 0000000..836be16
--- /dev/null
+++ b/samba-4.16.1+git.237.1d04c5f421f.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6fa14dae09f44d468b93d4b754955541076f27d550f0af4cd9bf1c771461e738
+size 33995207
diff --git a/samba.changes b/samba.changes
index 229ca28..4646412 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 11 09:30:15 UTC 2022 - Samuel Cabrero <scabrero@suse.de>
+
+- Use requires_eq macro to require the libldb2 version available at
+  samba-dsdb-modules build time; (bsc#1199362);
+
 -------------------------------------------------------------------
 Tue May  3 07:38:02 UTC 2022 - Samuel Cabrero <scabrero@suse.de>
 
diff --git a/samba.spec b/samba.spec
index 871319a..e805d44 100644
--- a/samba.spec
+++ b/samba.spec
@@ -142,7 +142,7 @@ BuildRequires:  liburing-devel
 %endif
 BuildRequires:  sysuser-tools
 
-Version:        4.16.1+git.235.f435da606f7
+Version:        4.16.1+git.237.1d04c5f421f
 Release:        0
 URL:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -567,7 +567,13 @@ libraries.
 Summary:        Samba LDB modules
 License:        GPL-3.0-or-later
 Group:          Productivity/Networking/Samba
-Requires:       libldb2 = %{ldb_version}
+# The ldb modules provided by this package check their own version matches
+# the libldb2 version. It the version do not match (e.g. libldb2 version
+# is updated and samba-dsdb-modules is not rebuilt against it) programs using
+# libldb2 won't start. The requires_eq macro will require the libldb2 version
+# available at build time without having to manually maintain the global
+# ldb_version variable in this spec file (bsc#1118508, bsc#1199362)
+%requires_eq libldb2
 Requires:       samba-ldb-ldap = %{version}
 Requires(post): /sbin/ldconfig
 Requires(postun):/sbin/ldconfig