From 373c16e966880fb4ca1db544d18c202ddb051a4f Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Mon, 28 Apr 2014 07:25:48 -0400
Subject: [PATCH] sync with upstream glusterfs.spec.in BZ #1091392

---
 glusterfs.spec | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/glusterfs.spec b/glusterfs.spec
index 027bf31..bdceeac 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -167,9 +167,6 @@ Obsoletes:        hekafs
 Obsoletes:        %{name}-common < %{version}-%{release}
 Obsoletes:        %{name}-core < %{version}-%{release}
 Obsoletes:        %{name}-ufo
-%if ( 0%{?rhel} && 0%{?rhel} < 6 )
-Obsoletes:        %{name}-geo-replication = %{version}-%{release}
-%endif
 Provides:         %{name}-common = %{version}-%{release}
 Provides:         %{name}-core = %{version}-%{release}
 
@@ -320,6 +317,9 @@ Requires:         rpcbind
 %else
 Requires:         portmap
 %endif
+%if ( 0%{?rhel} && 0%{?rhel} < 6 )
+Obsoletes:        %{name}-geo-replication = %{version}-%{release}
+%endif
 
 %description server
 GlusterFS is a clustered file-system capable of scaling to several
@@ -901,14 +901,6 @@ fi
 %_init_enable glusterd
 %_init_enable glusterfsd
 
-# hack to work around old rpm/rpmbuild %%doc misfeature
-%if ( 0%{?rhel} && 0%{?rhel} < 7 )
-if [ -d %{_pkgdocdir}.tmp ]; then
-    cp -p %{_pkgdocdir}.tmp/* %{_pkgdocdir}/
-    rm -rf %{_pkgdocdir}.tmp/*
-fi
-%endif
-
 # Genuine Fedora (and EPEL) builds never put gluster files in /etc; if
 # there are any files in /etc from a prior gluster.org install, move them
 # to /var/lib. (N.B. Starting with 3.3.0 all gluster files are in /var/lib