From 15403f96941caab4a4aa96630e47a9e831d32302 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Fri, 22 Feb 2019 09:59:59 -0500
Subject: packaging: Obsoleting glusterfs-gnfs for upgrade

Master refs
>    https://review.gluster.org/#/c/glusterfs/+/22253/
>    fixes: bz#1672711
>    Change-Id: Iad7194e788a8eeecd617614e9f8a1fe3264a384d
>    Signed-off-by: Sahina Bose <sabose@redhat.com>
>    Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>

Fixes: bz#1679968
Change-Id: Ib66d15953abb2645238f01c8ee9df54d2b35736a
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
---
 glusterfs.spec.in | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index b3709ac6b8e..f366455d569 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -317,6 +317,9 @@ Obsoletes:        %{name}-common < %{version}-%{release}
 Obsoletes:        %{name}-core < %{version}-%{release}
 Obsoletes:        %{name}-ufo
 Obsoletes:        %{name}-ganesha
+%if ( 0%{!?_with_gnfs:1} )
+Obsoletes:        %{name}-gnfs
+%endif
 Provides:         %{name}-common = %{version}-%{release}
 Provides:         %{name}-core = %{version}-%{release}
 
@@ -1507,6 +1510,9 @@ exit 0
 %endif
 
 %changelog
+* Thu Feb 21 2019 Jiffin Tony Thottan <jthottan@redhat.com>
+- Obsoleting gluster-gnfs package
+
 * Tue Oct 30 2018 Kaleb S. KEITHLEY <kkeithle@redhat.com>
 - liblvm2-devel no longer has liblvm2app.so
 
-- 
cgit