From f2db233692f41bc6b801aa943e110fc42ad74b914b5668d3e1eede25e179a395 Mon Sep 17 00:00:00 2001
From: Samuel Cabrero <scabrero@suse.com>
Date: Tue, 18 Jan 2022 12:53:25 +0000
Subject: [PATCH] Accepting request 947215 from
 home:scabrero:branches:network:samba:STABLE

- Use pkgconfig(krb5) as dependency for the -devel package: allow
  OBS to pick the right flavor of krb5-devel (full vs mini).
- Do not require the 'krb5' symbol by samba-client-libs: this
  package has an automatic dependency due to linkage on
  libgssapi_krb5.so.2. Automatic deps are always better.
- Do not require the 'krb5' symbol from samba-libs: samba-libs
  requires samba-client-libs, which in turn requires krb5
  libraries. Samba-libs itself has no need for krb5 (but get it
  indirectly anyway).

OBS-URL: https://build.opensuse.org/request/show/947215
OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=657
---
 samba-4.15.3+git.217.e1ef4460515.tar.bz2 |  3 ---
 samba-4.15.3+git.219.40cc1cd8591.tar.bz2 |  3 +++
 samba.changes                            | 13 +++++++++++++
 samba.spec                               |  6 ++----
 4 files changed, 18 insertions(+), 7 deletions(-)
 delete mode 100644 samba-4.15.3+git.217.e1ef4460515.tar.bz2
 create mode 100644 samba-4.15.3+git.219.40cc1cd8591.tar.bz2

diff --git a/samba-4.15.3+git.217.e1ef4460515.tar.bz2 b/samba-4.15.3+git.217.e1ef4460515.tar.bz2
deleted file mode 100644
index ea20357..0000000
--- a/samba-4.15.3+git.217.e1ef4460515.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1125cfa3b700b040d404f8622f04cefddfbeee06c51c084898a5ab5f448f3aff
-size 25610896
diff --git a/samba-4.15.3+git.219.40cc1cd8591.tar.bz2 b/samba-4.15.3+git.219.40cc1cd8591.tar.bz2
new file mode 100644
index 0000000..3cab1f3
--- /dev/null
+++ b/samba-4.15.3+git.219.40cc1cd8591.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a37dfcb03e72db04b53ed9f322a1eee4bf3e56995d4d5310927953075d960513
+size 25614195
diff --git a/samba.changes b/samba.changes
index 7d57b02..027a3ae 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jan 18 09:14:20 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use pkgconfig(krb5) as dependency for the -devel package: allow
+  OBS to pick the right flavor of krb5-devel (full vs mini).
+- Do not require the 'krb5' symbol by samba-client-libs: this
+  package has an automatic dependency due to linkage on
+  libgssapi_krb5.so.2. Automatic deps are always better.
+- Do not require the 'krb5' symbol from samba-libs: samba-libs
+  requires samba-client-libs, which in turn requires krb5
+  libraries. Samba-libs itself has no need for krb5 (but get it
+  indirectly anyway).
+
 -------------------------------------------------------------------
 Thu Jan 13 19:39:42 UTC 2022 - Samuel Cabrero <scabrero@suse.de>
 
diff --git a/samba.spec b/samba.spec
index 06e1d99..ed6b159 100644
--- a/samba.spec
+++ b/samba.spec
@@ -205,7 +205,7 @@ BuildRequires:  liburing-devel
 %else
 %define	build_make_smp_mflags %{?jobs:-j%jobs}
 %endif
-Version:        4.15.3+git.217.e1ef4460515
+Version:        4.15.3+git.219.40cc1cd8591
 Release:        0
 URL:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -320,7 +320,7 @@ Requires:       samba-winbind-libs
 %if %{with_dc}
 Requires:       samba-ad-dc-libs
 %if %{with_mit_dc}
-Requires:       krb5-devel
+Requires:       pkgconfig(krb5)
 %endif
 %endif
 Provides:       samba-core-devel = %{version}
@@ -388,7 +388,6 @@ the man pages.
 Summary:        Samba client libraries
 License:        GPL-3.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       krb5
 Provides:       libsmbclient0 = %{version}
 Obsoletes:      libsmbclient0 < %{version}
 Provides:       libndr2 = %{version}
@@ -438,7 +437,6 @@ programs.
 Summary:        Samba libraries
 License:        GPL-3.0-or-later
 Group:          Development/Libraries/C and C++
-Requires:       krb5
 Requires:       samba-client-libs = %{version}
 Recommends:     samba-libs-python3 = %{version}
 Provides:       libdcerpc-samr0 = %{version}