From 28fcf4532676f8b09d50b945b181c3c4cfe5825388f75157e3a7cb210eab80ab Mon Sep 17 00:00:00 2001
From: Noel Power <nopower@suse.com>
Date: Fri, 26 Nov 2021 15:58:37 +0000
Subject: [PATCH] Accepting request 934097 from
 home:scabrero:branches:network:samba:STABLE

- Fix dependency problem upgrading from libndr0 to libndr2 and
  from libsamba-credentials0 to libsamba-credentials1;
  (bsc#1192684);

OBS-URL: https://build.opensuse.org/request/show/934097
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=652
---
 baselibs.conf                            | 7 ++++++-
 samba-4.15.2+git.193.a4d6307f1fd.tar.bz2 | 3 ---
 samba-4.15.2+git.196.cf71c95e07e.tar.bz2 | 3 +++
 samba.changes                            | 7 +++++++
 samba.spec                               | 7 ++++++-
 5 files changed, 22 insertions(+), 5 deletions(-)
 delete mode 100644 samba-4.15.2+git.193.a4d6307f1fd.tar.bz2
 create mode 100644 samba-4.15.2+git.196.cf71c95e07e.tar.bz2

diff --git a/baselibs.conf b/baselibs.conf
index d9eac3d..d62bc26 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -2,6 +2,8 @@ libdcerpc0
 libdcerpc-binding0
 libdcerpc-samr0
 libndr2
+  provides   "libndr0-<targettype> = <version>"
+  obsoletes  "libndr0-<targettype> < <version>"
   provides   "libndr1-<targettype> = <version>"
   obsoletes  "libndr1-<targettype> < <version>"
 libndr-krb5pac0
@@ -11,7 +13,8 @@ libnetapi0
 libnetapi-devel
   requires "libnetapi0-<targettype> = %version"
 libsamba-credentials1
-  obsoletes "libsamba-credentials0 < <version>"
+  provides  "libsamba-credentials0-<targettype> = <version>"
+  obsoletes "libsamba-credentials0-<targettype> < <version>"
 libsamba-errors0
 libsamba-hostconfig0
 libsamba-passdb0
@@ -22,6 +25,8 @@ libsamdb0
 libsmbclient0
 libsmbconf0
 libsmbldap2
+  provides   "libsmbldap0-<targettype> = <version>"
+  obsoletes  "libsmbldap0-<targettype> < <version>"
 libtevent-util0
 libwbclient0
 samba-winbind
diff --git a/samba-4.15.2+git.193.a4d6307f1fd.tar.bz2 b/samba-4.15.2+git.193.a4d6307f1fd.tar.bz2
deleted file mode 100644
index fe9d35a..0000000
--- a/samba-4.15.2+git.193.a4d6307f1fd.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44f3c89fb4a81c393d559a355fc4395be8c37542aa085ab679682b1fcbf146ab
-size 25421589
diff --git a/samba-4.15.2+git.196.cf71c95e07e.tar.bz2 b/samba-4.15.2+git.196.cf71c95e07e.tar.bz2
new file mode 100644
index 0000000..9467631
--- /dev/null
+++ b/samba-4.15.2+git.196.cf71c95e07e.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:77feefb9d21908c965cb6680c6987389bbce1841a95a94672c716cb90d3d786a
+size 25422079
diff --git a/samba.changes b/samba.changes
index ad51555..b645d18 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 18 17:18:40 UTC 2021 - Samuel Cabrero <scabrero@suse.de>
+
+- Fix dependency problem upgrading from libndr0 to libndr2 and
+  from libsamba-credentials0 to libsamba-credentials1;
+  (bsc#1192684);
+
 -------------------------------------------------------------------
 Wed Nov 10 10:26:01 UTC 2021 - Samuel Cabrero <scabrero@suse.de>
 
diff --git a/samba.spec b/samba.spec
index 58da2a6..c6d5786 100644
--- a/samba.spec
+++ b/samba.spec
@@ -184,7 +184,7 @@ BuildRequires:  liburing-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        4.15.2+git.193.a4d6307f1fd
+Version:        4.15.2+git.196.cf71c95e07e
 Release:        0
 URL:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -563,6 +563,8 @@ applications that want to make use of libndr-standard.
 Summary:        Network Data Representation library
 License:        GPL-3.0-or-later
 Group:          System/Libraries
+Provides:       libndr0 = %{version}
+Obsoletes:      libndr0 < %{version}
 Provides:       libndr1 = %{version}
 Obsoletes:      libndr1 < %{version}
 
@@ -588,6 +590,7 @@ applications that want to make use of libndr.
 Summary:        Samba credential management library
 License:        GPL-3.0-or-later
 Group:          System/Libraries
+Provides:       libsamba-credentials0 = %{version}
 Obsoletes:      libsamba-credentials0 < %{version}
 
 %description -n libsamba-credentials1
@@ -756,6 +759,8 @@ applications that want to make use of libsmbconf.
 Summary:        Samba LDAP protocol helper function library
 License:        GPL-3.0-or-later
 Group:          System/Libraries
+Provides:       libsmbldap0 = %{version}
+Obsoletes:      libsmbldap0 < %{version}
 
 %description -n libsmbldap2
 libsmbldap contains LDAP protocol helper functions for Samba.