From cf33aa06bcb75663a5bd205b5a97c96789702377 Mon Sep 17 00:00:00 2001
From: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Date: Nov 05 2020 17:55:10 +0000
Subject: Merge branch 'c8-sig-storage-gluster-8' of ssh://git.centos.org/rpms/glusterfs into c8-sig-storage-gluster-8


Conflicts:
	SPECS/glusterfs.spec

---

diff --git a/SPECS/glusterfs.spec b/SPECS/glusterfs.spec
index 6ec40d2..18d265a 100644
--- a/SPECS/glusterfs.spec
+++ b/SPECS/glusterfs.spec
@@ -206,7 +206,7 @@ Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          8.2
-Release:          3%{?dev:%{dev}}%{?dist}
+Release:          4%{?dev:%{dev}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
@@ -280,6 +280,7 @@ Obsoletes:        %{name}-core < %{version}-%{release}
 Obsoletes:        %{name}-regression-tests
 %endif
 Obsoletes:        %{name}-rdma < %{version}-%{release}
+Provides:         %{name}-rdma = %{version}-%{release}
 %if ( 0%{!?_with_gnfs:1} )
 Obsoletes:        %{name}-gnfs < %{version}-%{release}
 %endif
@@ -1611,8 +1612,11 @@ exit 0
 %endif
 
 %changelog
-* Thu Nov 5 2020  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 8.2-3
-- glusterfs-ganesha
+* Thu Nov 5 2020  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 8.2-4
+- Remove obsoletes glusterfs-ganesha
+
+* Thu Nov 5 2020 Niels de Vos <ndevos@redhat.com> - 8.2-3
+- add provides for obsoleted glusterfs-rdma subpackage
 
 * Sat Oct 31 2020  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 8.2-2
 - resource-agents