From 67b57cd94819e4c9d90f1f6251f1b0896a39a1c1 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Mon, 31 May 2021 08:44:24 +0200
Subject: [PATCH] Move Obsoletes to samba-common-libs package

As samba-common is a noarch package, this could cause issues.

related: rhbz#1954531
---
 samba.spec | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/samba.spec b/samba.spec
index f2e33dc..65ad9df 100644
--- a/samba.spec
+++ b/samba.spec
@@ -108,7 +108,7 @@
 
 %define samba_requires_eq()  %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
 
-%global baserelease 6
+%global baserelease 7
 
 %global samba_version 4.14.4
 %global talloc_version 2.3.2
@@ -392,31 +392,6 @@ Recommends:     logrotate
 Provides: samba4-common = %{samba_depver}
 Obsoletes: samba4-common < %{samba_depver}
 
-%if %{without dc} && %{without testsuite}
-Obsoletes: samba-dc < %{samba_depver}
-Obsoletes: samba-dc-libs < %{samba_depver}
-Obsoletes: samba-dc-bind-dlz < %{samba_depver}
-%endif
-
-# If only build glusterfs for RHGS and Fedora, so obsolete it on other version
-# of the distro
-%if %{without vfs_glusterfs}
-Obsoletes: samba-vfs-glusterfs < %{samba_depver}
-# endif without vfs_glusterfs
-%endif
-
-# ctdb-tests package has been dropped if we do not build the testsuite
-%if %{with clustering}
-%if %{without testsuite}
-Obsoletes: ctdb-tests < %{samba_depver}
-Obsoletes: ctdb-tests-debuginfo < %{samba_depver}
-# endif without testsuite
-%endif
-# endif with clustering
-%endif
-
-Provides: bundled(libreplace)
-
 %description common
 samba-common provides files necessary for both the server and client
 packages of Samba.
@@ -433,6 +408,29 @@ Requires: libwbclient = %{samba_depver}
 
 Provides: bundled(libreplace)
 
+%if %{without dc} && %{without testsuite}
+Obsoletes: samba-dc < %{samba_depver}
+Obsoletes: samba-dc-libs < %{samba_depver}
+Obsoletes: samba-dc-bind-dlz < %{samba_depver}
+%endif
+
+# ctdb-tests package has been dropped if we do not build the testsuite
+%if %{with clustering}
+%if %{without testsuite}
+Obsoletes: ctdb-tests < %{samba_depver}
+Obsoletes: ctdb-tests-debuginfo < %{samba_depver}
+# endif without testsuite
+%endif
+# endif with clustering
+%endif
+
+# If only build glusterfs for RHGS and Fedora, so obsolete it on other version
+# of the distro
+%if %{without vfs_glusterfs}
+Obsoletes: samba-vfs-glusterfs < %{samba_depver}
+# endif without vfs_glusterfs
+%endif
+
 %description common-libs
 The samba-common-libs package contains internal libraries needed by the
 SMB/CIFS clients.