From e0289d8083355ea14c43eadf62d1966d9c067087 Mon Sep 17 00:00:00 2001
From: basebuilder_pel7x64builder0 <basebuilder@powerel.org>
Date: Tue, 30 Apr 2019 15:12:18 +0200
Subject: [PATCH] glusterfs package update 6.1

Signed-off-by: basebuilder_pel7x64builder0 <basebuilder@powerel.org>
---
 SPECS/glusterfs.spec | 46 ++------------------------------------------
 1 file changed, 2 insertions(+), 44 deletions(-)

diff --git a/SPECS/glusterfs.spec b/SPECS/glusterfs.spec
index 67314cd3..4e132f04 100644
--- a/SPECS/glusterfs.spec
+++ b/SPECS/glusterfs.spec
@@ -18,19 +18,11 @@
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with asan
 %{?_with_asan:%global _with_asan --enable-asan}
 
-%if ( 0%{?rhel} && 0%{?rhel} < 7 )
-%global _with_asan %{nil}
-%endif
-
 # bd
 # if you wish to compile an rpm without the BD map support...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd
 %{?_without_bd:%global _without_bd --disable-bd-xlator}
 
-%if ( 0%{?rhel} && 0%{?rhel} > 7 )
-%global _without_bd --without-bd
-%endif
-
 # cmocka
 # if you wish to compile an rpm with cmocka unit testing...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with cmocka
@@ -78,9 +70,7 @@
 
 # Do not use libtirpc on EL6, it does not have xdr_uint64_t() and xdr_uint32_t
 # Do not use libtirpc on EL7, it does not have xdr_sizeof()
-%if ( 0%{?rhel} && 0%{?rhel} < 8 )
-%global _without_libtirpc --without-libtirpc
-%endif
+# # # %#%global _without_libtirpc --without-libtirpc
 
 # ocf
 # if you wish to compile an rpm without the OCF resource agents...
@@ -92,21 +82,11 @@
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
 %{?_without_rdma:%global _without_rdma --disable-ibverbs}
 
-# No RDMA Support on armv7hl
-%ifarch armv7hl
-%global _without_rdma --disable-ibverbs
-%endif
-
 # server
 # if you wish to build rpms without server components, compile like this
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without server
 %{?_without_server:%global _without_server --without-server}
 
-# disable server components forcefully as rhel <= 6
-%if ( 0%{?rhel} && 0%{?rhel} < 7 )
-%global _without_server --without-server
-%endif
-
 # syslog
 # if you wish to build rpms without syslog logging, compile like this
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without syslog
@@ -125,10 +105,6 @@
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with tsan
 %{?_with_tsan:%global _with_tsan --enable-tsan}
 
-%if ( 0%{?rhel} && 0%{?rhel} < 7 )
-%global _with_tsan %{nil}
-%endif
-
 # valgrind
 # if you wish to compile an rpm to run all processes under valgrind...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with valgrind
@@ -138,13 +114,8 @@
 ## All %%global definitions should be placed here and keep them sorted
 ##
 
-%if ( 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
 %global _with_systemd true
-%endif
-
-%if ( 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
 %global _with_firewalld --enable-firewalld
-%endif
 
 %if ( 0%{?_tmpfilesdir:1} )
 %global _with_tmpfilesdir --with-tmpfilesdir=%{_tmpfilesdir}
@@ -152,21 +123,8 @@
 %global _with_tmpfilesdir --without-tmpfilesdir
 %endif
 
-# without server should also disable some server-only components
-%if ( 0%{?_without_server:1} )
-%global _without_events --disable-events
-%global _without_georeplication --disable-georeplication
-%global _with_gnfs %{nil}
-%global _without_ocf --without-ocf
-%endif
-
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 7 )
 %global _usepython3 1
 %global _pythonver 3
-%else
-%global _usepython3 0
-%global _pythonver 2
-%endif
 
 # From https://fedoraproject.org/wiki/Packaging:Python#Macros
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
@@ -232,7 +190,7 @@
 Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
-Version:          6.0
+Version:          6.1
 Release:          %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@