From d79e85e4ffa52c40babec777578f98706e334209 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Thu, 11 Jun 2020 06:46:56 -0400
Subject: packaging: refactor to align with common practices

Apparently some sdditional Obsoletes: are required

Change-Id: I919ae5a0fcc6f720e3eab4784af36977b9eef044
Fixes: #1126
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
---
 glusterfs.spec.in | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index cb27ec2fa34..8ec9e85bf95 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -457,6 +457,7 @@ Summary:          GlusterFS libglusterfs library
 Requires:         libgfrpc0%{?_isa} = %{version}-%{release}
 Requires:         libgfxdr0%{?_isa} = %{version}-%{release}
 Obsoletes:        %{name}-libs <= %{version}-%{release}
+Provides:         %{name}-libs = %{version}-%{release}
 
 %description -n libglusterfs0
 GlusterFS is a distributed file-system capable of scaling to several
@@ -473,6 +474,7 @@ Summary:          GlusterFS libglusterfs library
 Requires:         libgfrpc-devel%{?_isa} = %{version}-%{release}
 Requires:         libgfxdr-devel%{?_isa} = %{version}-%{release}
 Obsoletes:        %{name}-devel <= %{version}-%{release}
+Provides:         %{name}-devel = %{version}-%{release}
 
 %description -n libglusterfs-devel
 GlusterFS is a distributed file-system capable of scaling to several
@@ -489,6 +491,7 @@ Summary:          GlusterFS api library
 Requires:         libglusterfs0%{?_isa} = %{version}-%{release}
 Requires:         %{name}-client-xlators%{?_isa} = %{version}-%{release}
 Obsoletes:        %{name}-api <= %{version}-%{release}
+Provides:         %{name}-api = %{version}-%{release}
 
 %description -n libgfapi0
 GlusterFS is a distributed file-system capable of scaling to several
@@ -505,6 +508,7 @@ Summary:          Development Libraries
 Requires:         libglusterfs-devel%{?_isa} = %{version}-%{release}
 Requires:         libacl-devel
 Obsoletes:        %{name}-api-devel <= %{version}-%{release}
+Provides:         %{name}-api-devel = %{version}-%{release}
 
 %description -n libgfapi-devel
 GlusterFS is a distributed file-system capable of scaling to several
@@ -519,6 +523,7 @@ This package provides libgfapi.so and the api C header files.
 %package -n libgfchangelog0
 Summary:          GlusterFS libchangelog library
 Requires:         libglusterfs0%{?_isa} = %{version}-%{release}
+Obsoletes:        %{name}-libs <= %{version}-%{release}
 
 %description -n libgfchangelog0
 GlusterFS is a distributed file-system capable of scaling to several
@@ -533,6 +538,7 @@ This package provides the libgfchangelog library
 %package -n libgfchangelog-devel
 Summary:          GlusterFS libchangelog library
 Requires:         libglusterfs-devel%{?_isa} = %{version}-%{release}
+Obsoletes:        %{name}-devel <= %{version}-%{release}
 
 %description -n libgfchangelog-devel
 GlusterFS is a distributed file-system capable of scaling to several
@@ -547,6 +553,7 @@ This package provides libgfchangelog.so and changelog C header files.
 %package -n libgfrpc0
 Summary:          GlusterFS libgfrpc0 library
 Requires:         libglusterfs0%{?_isa} = %{version}-%{release}
+Obsoletes:        %{name}-libs <= %{version}-%{release}
 
 %description -n libgfrpc0
 GlusterFS is a distributed file-system capable of scaling to several
@@ -561,6 +568,7 @@ This package provides the libgfrpc library
 %package -n libgfrpc-devel
 Summary:          GlusterFS libgfrpc library
 Requires:         libglusterfs0%{?_isa} = %{version}-%{release}
+Obsoletes:        %{name}-devel <= %{version}-%{release}
 
 %description -n libgfrpc-devel
 GlusterFS is a distributed file-system capable of scaling to several
@@ -575,6 +583,7 @@ This package provides libgfrpc.so and rpc C header files.
 %package -n libgfxdr0
 Summary:          GlusterFS libgfxdr0 library
 Requires:         libglusterfs0%{?_isa} = %{version}-%{release}
+Obsoletes:        %{name}-libs <= %{version}-%{release}
 
 %description -n libgfxdr0
 GlusterFS is a distributed file-system capable of scaling to several
@@ -589,6 +598,7 @@ This package provides the libgfxdr library
 %package -n libgfxdr-devel
 Summary:          GlusterFS libgfxdr library
 Requires:         libglusterfs0%{?_isa} = %{version}-%{release}
+Obsoletes:        %{name}-devel <= %{version}-%{release}
 
 %description -n libgfxdr-devel
 GlusterFS is a distributed file-system capable of scaling to several
@@ -603,6 +613,7 @@ This package provides libgfxdr.so.
 %package -n libglusterd0
 Summary:          GlusterFS libglusterd library
 Requires:         libglusterfs0%{?_isa} = %{version}-%{release}
+Obsoletes:        %{name}-libs <= %{version}-%{release}
 
 %description -n libglusterd0
 GlusterFS is a distributed file-system capable of scaling to several
-- 
cgit