From 0cd8f5ac00930648a416377a0ad3e75a67e3d010 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Fri, 25 Apr 2014 09:52:49 -0400
Subject: [PATCH] sync with upstream glusterfs.spec.in BZ #1091392

---
 glusterfs.spec | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/glusterfs.spec b/glusterfs.spec
index 89c61f2..027bf31 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -26,12 +26,17 @@
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without georeplication
 %{?_without_georeplication:%global _without_georeplication --disable-georeplication}
 
+# Disable geo-replication on EL5, as its default Python is too old
+%if ( 0%{?rhel} && 0%{?rhel} < 6 )
+%global _without_georeplication --disable-georeplication
+%endif
+
 # if you wish to compile an rpm without the OCF resource agents...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without ocf
 %{?_without_ocf:%global _without_ocf --without-ocf}
 
 # if you wish to build rpms without syslog logging, compile like this
-# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@tar.gz --without syslog
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without syslog
 %{?_without_syslog:%global _without_syslog --disable-syslog}
 
 # disable syslog forcefully as rhel <= 6 doesn't have rsyslog or rsyslog-mmcount
@@ -85,7 +90,7 @@ License:          GPLv2 or LGPLv3+
 Group:            System Environment/Base
 URL:              http://www.gluster.org/docs/index.php/GlusterFS
 %if ( 0%{_for_fedora_koji_builds} )
-Source0:           http://bits.gluster.org/pub/gluster/glusterfs/src/glusterfs-%{version}%{?prereltag}.tar.gz
+Source0:          http://bits.gluster.org/pub/gluster/glusterfs/src/glusterfs-%{version}%{?prereltag}.tar.gz
 Source1:          glusterd.sysconfig
 Source2:          glusterfsd.sysconfig
 Source3:          glusterfs-fuse.logrotate
@@ -161,9 +166,12 @@ BuildRequires:    libattr-devel
 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}
-Obsoletes:        %{name}-ufo
 
 # We do not want to generate useless provides and requires for xlator .so files
 # Filter all generated:
@@ -797,11 +805,10 @@ fi
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server*
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt*
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs*
-# hack to work around old rpm/rpmbuild %%doc misfeature
 %ghost %attr(0644,-,-) %config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info
 %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
 # This is really ugly, but I have no idea how to mark these directories in
-# any other way. They should belong to the glusterfs-server package, but 
+# any other way. They should belong to the glusterfs-server package, but
 # don't exist after installation. They are generated on the first start...
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1
@@ -886,7 +893,6 @@ fi
 %{_includedir}/glusterfs/api/*
 
 %files regression-tests
-%defattr(-,root,root,-)
 %{_prefix}/share/glusterfs/*
 %exclude %{_prefix}/share/glusterfs/tests/basic/rpm.t
 
@@ -961,6 +967,9 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
+* Fri Apr 25 2014 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
+- sync with upstream glusterfs.spec.in BZ #1091392
+
 * Wed Apr 23 2014 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.5.0-2
 - GlusterFS 3.5.0 GA, glusterfs-3.5.0-2, glusterfs.spec nits