diff --git a/README.md b/README.md
index c97c1bf..e4a8578 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ Branch names follow convention like `c<VERSION>-sig-storage-gluster-<GLUSTERFS-V
 * c6-sig-storage-gluster-5: CentOS-6, glusterfs-5
 * c7-sig-storage-gluster-5: CentOS-7, glusterfs-5
 * c7-sig-storage-gluster-6: CentOS-7, glusterfs-6
+* c8-sig-storage-gluster-7: CentOS-8, glusterfs-ld the src.rpm with:
 * ...
 
 Instructions for building the glusterfs package for the CentOS Storage SIG can be found in the following places:
@@ -13,3 +14,14 @@ Instructions for building the glusterfs package for the CentOS Storage SIG can b
 * [Comunity Build System](https://wiki.centos.org/HowTos/CommunityBuildSystem)
 * [Storage SIG landing page](https://wiki.centos.org/SpecialInterestGroup/Storage/Gluster)
 
+
+E.g. build the src.rpm with:
+    $ rpmbuild -bs \
+               --define "_sourcedir $PWD/SOURCES" --define "_srcrpmdir $PWD" \
+               --define "dist .el8" SPECS/glusterfs.spec
+
+To build:
+
+    $ `cbs build [--scratch] storage8-glusterfs-7-el8 glusterfs-7.2-1.el8.src.rpm`
+
+
diff --git a/SPECS/glusterfs.spec b/SPECS/glusterfs.spec
index 5779b4a..365dd07 100644
--- a/SPECS/glusterfs.spec
+++ b/SPECS/glusterfs.spec
@@ -1,9 +1,13 @@
+# This package depends on automagic byte compilation
+# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
+%global _python_bytecompile_extra 1
+
 %global _hardened_build 1
 
 %global _for_fedora_koji_builds 1
 
-# uncomment and add '%' to use the prereltag for pre-releases
-# %%global prereltag rc1
+# uncomment and add '%' to use the %%dev for pre-releases
+#%%global dev rc3
 
 ##-----------------------------------------------------------------------------
 ## All argument definitions should be placed here and keep them sorted
@@ -11,7 +15,7 @@
 
 # asan
 # if you wish to compile an rpm with address sanitizer...
-# rpmbuild -ta glusterfs-5.0rc0.tar.gz --with asan
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with asan
 %{?_with_asan:%global _with_asan --enable-asan}
 
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
@@ -20,92 +24,91 @@
 
 # cmocka
 # if you wish to compile an rpm with cmocka unit testing...
-# rpmbuild -ta glusterfs-5.0rc0.tar.gz --with cmocka
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with cmocka
 %{?_with_cmocka:%global _with_cmocka --enable-cmocka}
 
 # debug
 # if you wish to compile an rpm with debugging...
-# rpmbuild -ta glusterfs-5.0rc0.tar.gz --with debug
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with debug
 %{?_with_debug:%global _with_debug --enable-debug}
 
 # epoll
 # if you wish to compile an rpm without epoll...
-# rpmbuild -ta glusterfs-5.0rc0.tar.gz --without epoll
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without epoll
 %{?_without_epoll:%global _without_epoll --disable-epoll}
 
 # fusermount
 # if you wish to compile an rpm without fusermount...
-# rpmbuild -ta glusterfs-5.0rc0.tar.gz --without fusermount
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without fusermount
 %{?_without_fusermount:%global _without_fusermount --disable-fusermount}
 
 # geo-rep
 # if you wish to compile an rpm without geo-replication support, compile like this...
-# rpmbuild -ta glusterfs-5.0rc0.tar.gz --without georeplication
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without georeplication
 %{?_without_georeplication:%global _without_georeplication --disable-georeplication}
 
 # gnfs
 # if you wish to compile an rpm with the legacy gNFS server xlator
-# rpmbuild -ta glusterfs-5.0rc0.tar.gz --with gnfs
-%{?_with_gnfs:%global _with_gnfs --enable-gnfs}
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with gnfs
+%{?_without_gnfs:%global _with_gnfs --disable-gnfs}
 
 # ipv6default
 # if you wish to compile an rpm with IPv6 default...
-# rpmbuild -ta glusterfs-5.0rc0.tar.gz --with ipv6default
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with ipv6default
 %{?_with_ipv6default:%global _with_ipv6default --with-ipv6-default}
 
 # libtirpc
 # if you wish to compile an rpm without TIRPC (i.e. use legacy glibc rpc)
-# rpmbuild -ta glusterfs-5.0rc0.tar.gz --without libtirpc
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without libtirpc
 %{?_without_libtirpc:%global _without_libtirpc --without-libtirpc}
 
 # 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} <= 7 )
+%if ( 0%{?rhel} && 0%{?rhel} < 8 )
 %global _without_libtirpc --without-libtirpc
 %endif
 
-
 # ocf
 # if you wish to compile an rpm without the OCF resource agents...
-# rpmbuild -ta glusterfs-5.0rc0.tar.gz --without ocf
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without ocf
 %{?_without_ocf:%global _without_ocf --without-ocf}
 
 # rdma
 # if you wish to compile an rpm without rdma support, compile like this...
-# rpmbuild -ta glusterfs-5.0rc0.tar.gz --without rdma
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
 %{?_without_rdma:%global _without_rdma --disable-ibverbs}
 
-# No RDMA Support on 32-bit ARM
+# 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 glusterfs-5.0rc0.tar.gz --without server
+# 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} <= 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 glusterfs-5.0rc0.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
 # Fedora deprecated syslog, see
 #  https://fedoraproject.org/wiki/Changes/NoDefaultSyslog
 # (And what about RHEL7?)
-%if ( 0%{?fedora} && 0%{?fedora} >= 20 ) || ( 0%{?rhel} && 0%{?rhel} <= 6 )
+%if ( ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} < 7 ) )
 %global _without_syslog --disable-syslog
 %endif
 
 # tsan
 # if you wish to compile an rpm with thread sanitizer...
-# rpmbuild -ta glusterfs-6.0rc0.tar.gz --with tsan
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with tsan
 %{?_with_tsan:%global _with_tsan --enable-tsan}
 
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
@@ -114,29 +117,25 @@
 
 # valgrind
 # if you wish to compile an rpm to run all processes under valgrind...
-# rpmbuild -ta glusterfs-5.0rc0.tar.gz --with valgrind
+# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with valgrind
 %{?_with_valgrind:%global _with_valgrind --enable-valgrind}
 
 ##-----------------------------------------------------------------------------
 ## 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} >= 7 )
+%if ( 0%{?fedora} || ( 0%{?rhel} && 0%{?rhel} > 6 ) )
 %global _with_firewalld --enable-firewalld
 %endif
 
-%if 0%{?_tmpfilesdir:1}
+%if ( 0%{?_tmpfilesdir:1} )
 %global _with_tmpfilesdir --with-tmpfilesdir=%{_tmpfilesdir}
 %else
 %global _with_tmpfilesdir --without-tmpfilesdir
 %endif
 
 # without server should also disable some server-only components
-%if 0%{?_without_server:1}
+%if ( 0%{?_without_server:1} )
 %global _without_events --disable-events
 %global _without_georeplication --disable-georeplication
 %global _with_gnfs %{nil}
@@ -152,13 +151,12 @@
 %endif
 
 # From https://fedoraproject.org/wiki/Packaging:Python#Macros
-%if ( 0%{?rhel} && 0%{?rhel} <= 6 )
-%{!?python2_sitelib: %global python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%if ( 0%{?rhel} && 0%{?rhel} < 7 )
+%{!?python2_sitelib: %global python2_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python2_sitearch: %global python2_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %global _rundir %{_localstatedir}/run
 %endif
 
-%if ( 0%{?_with_systemd:1} )
 %global service_start()   /bin/systemctl --quiet start %1.service || : \
 %{nil}
 %global service_stop()    /bin/systemctl --quiet stop %1.service || :\
@@ -171,24 +169,6 @@
 %global glusterta_svcfile %{_unitdir}/gluster-ta-volume.service
 %global glustereventsd_svcfile %{_unitdir}/glustereventsd.service
 %global glusterfssharedstorage_svcfile %{_unitdir}/glusterfssharedstorage.service
-%else
-%global systemd_post()  /sbin/chkconfig --add %1 >/dev/null 2>&1 || : \
-%{nil}
-%global systemd_preun() /sbin/chkconfig --del %1 >/dev/null 2>&1 || : \
-%{nil}
-%global systemd_postun_with_restart() /sbin/service %1 condrestart >/dev/null 2>&1 || : \
-%{nil}
-%global service_start()   /sbin/service %1 start >/dev/null 2>&1 || : \
-%{nil}
-%global service_stop()    /sbin/service %1 stop >/dev/null 2>&1 || : \
-%{nil}
-%global service_install() install -D -p -m 0755 %{_sourcedir}/%1.init %{buildroot}%2 \
-%{nil}
-# can't seem to make a generic macro that works
-%global glusterd_svcfile   %{_sysconfdir}/init.d/glusterd
-%global glusterfsd_svcfile %{_sysconfdir}/init.d/glusterfsd
-%global glustereventsd_svcfile %{_sysconfdir}/init.d/glustereventsd
-%endif
 
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
@@ -210,23 +190,22 @@
 
 
 ##-----------------------------------------------------------------------------
-## All package definitions should be placed here in alphabetical order
+## All package definitions should be placed here and keep them sorted
 ##
 Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          7.2
-Release:          %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}
+Release:          1%{?dev:%{dev}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
-Release:          0.@PACKAGE_RELEASE@%{?dist}.3
+Release:          0.@PACKAGE_RELEASE@%{?dist}.1
 %endif
 License:          GPLv2 or LGPLv3+
-Group:            System Environment/Base
 URL:              http://docs.gluster.org/
 %if ( 0%{_for_fedora_koji_builds} )
-Source0:          https://download.gluster.org/pub/gluster/%{name}/7/%{version}%{?prereltag}/%{name}-%{version}%{?prereltag}.tar.gz
+Source0:          http://download.gluster.org/pub/gluster/%{name}/LATEST/%{version}%{?dev}/%{name}-%{version}%{?dev}.tar.gz
 Source1:          glusterd.sysconfig
 Source2:          glusterfsd.sysconfig
 Source7:          glusterfsd.service
@@ -235,17 +214,13 @@ Source8:          glusterfsd.init
 Source0:          @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz
 %endif
 
-BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
 Requires(pre):    shadow-utils
-%if ( 0%{?_with_systemd:1} )
 BuildRequires:    systemd
-%endif
 
 Requires:         %{name}-libs = %{version}-%{release}
-%if ( 0%{?_with_systemd:1} )
 %{?systemd_requires}
-%endif
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 %if 0%{?_with_asan:1} && !( 0%{?rhel} && 0%{?rhel} < 7 )
 BuildRequires:    libasan
 %endif
@@ -261,14 +236,14 @@ BuildRequires:    python%{_pythonver}-devel
 %if ( 0%{?rhel} && 0%{?rhel} < 8 )
 BuildRequires:    python-ctypes
 %endif
-%if ( 0%{?_with_ipv6default:1} ) || ( 0%{!?_without_libtirpc:1} )
+%if ( ( 0%{?_with_ipv6default:1} ) || ( 0%{!?_without_libtirpc:1} ) )
 BuildRequires:    libtirpc-devel
 %endif
 %if ( 0%{?fedora} && 0%{?fedora} > 27 ) || ( 0%{?rhel} && 0%{?rhel} > 7 )
 BuildRequires:    rpcgen
 %endif
 BuildRequires:    userspace-rcu-devel >= 0.7
-%if ( 0%{?rhel} && 0%{?rhel} <= 6 )
+%if ( 0%{?rhel} && 0%{?rhel} < 7 )
 BuildRequires:    automake
 %endif
 BuildRequires:    libuuid-devel
@@ -279,7 +254,7 @@ BuildRequires:    libcmocka-devel >= 1.0.1
 BuildRequires:    libattr-devel
 %endif
 
-%if (0%{?_with_firewalld:1})
+%if ( 0%{?_with_firewalld:1} )
 BuildRequires:    firewalld
 %endif
 
@@ -290,10 +265,10 @@ Obsoletes:        %{name}-core < %{version}-%{release}
 Obsoletes:        %{name}-regression-tests
 %endif
 Obsoletes:        %{name}-ufo
-Obsoletes:        %{name}-ganesha
 %if ( 0%{!?_with_gnfs:1} )
 Obsoletes:        %{name}-gnfs
 %endif
+Obsoletes:        %{name}-ganesha
 Provides:         %{name}-common = %{version}-%{release}
 Provides:         %{name}-core = %{version}-%{release}
 
@@ -314,6 +289,8 @@ and client framework.
 Summary:          GlusterFS api library
 Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-client-xlators = %{version}-%{release}
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description api
 GlusterFS is a distributed file-system capable of scaling to several
@@ -358,6 +335,20 @@ is in user space and easily manageable.
 
 This package provides the GlusterFS CLI application and its man page
 
+%package client-xlators
+Summary:          GlusterFS client-side translators
+
+%description client-xlators
+GlusterFS is a distributed file-system capable of scaling to several
+petabytes. It aggregates various storage bricks over Infiniband RDMA
+or TCP/IP interconnect into one large parallel network file
+system. GlusterFS is one of the most sophisticated file systems in
+terms of features and extensibility.  It borrows a powerful concept
+called Translators from GNU Hurd kernel. Much of the code in GlusterFS
+is in user space and easily manageable.
+
+This package provides the translators needed on any GlusterFS client.
+
 %package cloudsync-plugins
 Summary:          Cloudsync Plugins
 BuildRequires:    libcurl-devel
@@ -390,9 +381,39 @@ is in user space and easily manageable.
 
 This package provides the development libraries and include files.
 
+
+%if ( 0%{!?_without_events:1} )
+%package events
+Summary:          GlusterFS Events
+Requires:         %{name}-server%{?_isa} = %{version}-%{release}
+Requires:         python%{_pythonver}
+Requires:         python%{_pythonver}-prettytable
+Requires:         python%{_pythonver}-gluster = %{version}-%{release}
+%if ( 0%{?rhel} && 0%{?rhel} < 8 )
+Requires:         python-requests
+%else
+Requires:         python%{_pythonver}-requests
+%endif
+%if ( 0%{?rhel} && 0%{?rhel} < 7 )
+Requires:         python-argparse
+%endif
+%{?systemd_requires}
+
+%description events
+GlusterFS is a distributed file-system capable of scaling to several
+petabytes. It aggregates various storage bricks over Infiniband RDMA
+or TCP/IP interconnect into one large parallel network file
+system. GlusterFS is one of the most sophisticated file systems in
+terms of features and extensibility.  It borrows a powerful concept
+called Translators from GNU Hurd kernel. Much of the code in GlusterFS
+is in user space and easily manageable.
+
+This package provides the GlusterFS Events
+%endif
+
 %package extra-xlators
 Summary:          Extra Gluster filesystem Translators
-# We need python-gluster rpm for gluster module's __init__.py in Python
+# We need python2-gluster rpm for gluster module's __init__.py in Python
 # site-packages area
 Requires:         python%{_pythonver}-gluster = %{version}-%{release}
 Requires:         python%{_pythonver}
@@ -430,8 +451,8 @@ terms of features and extensibility.  It borrows a powerful concept
 called Translators from GNU Hurd kernel. Much of the code in GlusterFS
 is in user space and easily manageable.
 
-This package provides support to FUSE based clients and inlcudes the
-glusterfs(d) binary.
+This package provides support to FUSE based clients and includes the
+glusterfsd and glusterfs binaries.
 
 %if ( 0%{!?_without_georeplication:1} )
 %package geo-replication
@@ -441,9 +462,7 @@ Requires:         %{name}-server = %{version}-%{release}
 Requires:         python%{_pythonver}
 Requires:         python%{_pythonver}-prettytable
 Requires:         python%{_pythonver}-gluster = %{version}-%{release}
-
 Requires:         rsync
-Requires:         util-linux
 
 %description geo-replication
 GlusterFS is a distributed file-system capable of scaling to several
@@ -478,6 +497,8 @@ This package provides the glusterfs legacy gNFS server xlator
 
 %package libs
 Summary:          GlusterFS common libraries
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 
 %description libs
 GlusterFS is a distributed file-system capable of scaling to several
@@ -543,8 +564,7 @@ Requires:         %{name}-server = %{version}-%{release}
 ## thin provisioning support
 Requires:         lvm2 >= 2.02.89
 Requires:         perl(App::Prove) perl(Test::Harness) gcc util-linux-ng
-Requires:         python%{_pythonver}
-Requires:         attr dbench file git libacl-devel net-tools
+Requires:         python%{_pythonver} attr dbench file git libacl-devel net-tools
 Requires:         nfs-utils xfsprogs yajl psmisc bc
 
 %description regression-tests
@@ -557,7 +577,6 @@ regression testing of Gluster.
 Summary:          OCF Resource Agents for GlusterFS
 License:          GPLv3+
 BuildArch:        noarch
-# this Group handling comes from the Fedora resource-agents package
 # for glusterd
 Requires:         %{name}-server = %{version}-%{release}
 # depending on the distribution, we need pacemaker or resource-agents
@@ -589,15 +608,11 @@ Requires:         %{name}-fuse = %{version}-%{release}
 Requires:         %{name}-api = %{version}-%{release}
 Requires:         %{name}-client-xlators = %{version}-%{release}
 # lvm2 for snapshot, and nfs-utils and rpcbind/portmap for gnfs server
+Requires:         psmisc
 Requires:         lvm2
-%if ( 0%{?_with_systemd:1} )
 %{?systemd_requires}
-%else
-Requires(post):   /sbin/chkconfig
-Requires(preun):  /sbin/service
-Requires(preun):  /sbin/chkconfig
-Requires(postun): /sbin/service
-%endif
+Requires(post):   /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
 %if (0%{?_with_firewalld:1})
 # we install firewalld rules, so we need to have the directory owned
 %if ( 0%{!?rhel} )
@@ -606,12 +621,12 @@ Requires(postun): /sbin/service
 Requires:         firewalld-filesystem
 %endif
 %endif
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
+%if ( 0%{?fedora} ) || ( 0%{?rhel} )
 Requires:         rpcbind
 %else
 Requires:         portmap
 %endif
-%if ( 0%{?rhel} && 0%{?rhel} <= 6 )
+%if ( 0%{?rhel} && 0%{?rhel} < 7 )
 Requires:         python-argparse
 %endif
 %if ( 0%{?fedora} && 0%{?fedora} > 27 ) || ( 0%{?rhel} && 0%{?rhel} > 7 )
@@ -638,54 +653,18 @@ This package provides the glusterfs server daemon.
 %package thin-arbiter
 Summary:          GlusterFS thin-arbiter module
 Requires:         %{name}%{?_isa} = %{version}-%{release}
+Requires:         %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:         %{name}-server%{?_isa} = %{version}-%{release}
 
 %description thin-arbiter
 This package provides a tie-breaker functionality to GlusterFS
 replicate volume. It includes translators required to provide the
-functionality, and also few other scripts required for getting the setup done.
+functionality, and also few other scripts required for setup.
 
 This package provides the glusterfs thin-arbiter translator.
 
-%package client-xlators
-Summary:          GlusterFS client-side translators
-
-%description client-xlators
-GlusterFS is a distributed file-system capable of scaling to several
-petabytes. It aggregates various storage bricks over Infiniband RDMA
-or TCP/IP interconnect into one large parallel network file
-system. GlusterFS is one of the most sophisticated file systems in
-terms of features and extensibility.  It borrows a powerful concept
-called Translators from GNU Hurd kernel. Much of the code in GlusterFS
-is in user space and easily manageable.
-
-This package provides the translators needed on any GlusterFS client.
-
-%if ( 0%{!?_without_events:1} )
-%package events
-Summary:          GlusterFS Events
-Requires:         %{name}-server%{?_isa} = %{version}-%{release}
-Requires:         python%{_pythonver} python%{_pythonver}-prettytable
-Requires:         python%{_pythonver}-gluster = %{version}-%{release}
-%if ( 0%{?rhel} && 0%{?rhel} < 8 )
-Requires:         python-requests
-%else
-Requires:         python%{_pythonver}-requests
-%endif
-%if ( 0%{?rhel} && 0%{?rhel} < 7 )
-Requires:         python-argparse
-%endif
-%if ( 0%{?_with_systemd:1} )
-%{?systemd_requires}
-%endif
-
-%description events
-GlusterFS Events
-
-%endif
-
 %prep
-%setup -q -n %{name}-%{version}%{?prereltag}
+%setup -q -n %{name}-%{version}%{?dev}
 %if ( ! %{_usepython3} )
 echo "fixing python shebangs..."
 for f in api events extras geo-replication libglusterfs tools xlators; do
@@ -695,12 +674,8 @@ done
 
 %build
 
-# RHEL6 and earlier need to manually replace config.guess and config.sub
-%if ( 0%{?rhel} && 0%{?rhel} <= 6 )
-./autogen.sh
-%endif
-
-%configure \
+sed -i -e 's/--quiet//' configure.ac
+./autogen.sh && %configure \
         %{?_with_asan} \
         %{?_with_cmocka} \
         %{?_with_debug} \
@@ -721,13 +696,14 @@ done
         %{?_without_libtirpc}
 
 # fix hardening and remove rpath in shlibs
-%if ( 0%{?fedora} && 0%{?fedora} > 17 ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
+%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
 sed -i 's| \\\$compiler_flags |&\\\$LDFLAGS |' libtool
 %endif
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|' libtool
 
-make %{?_smp_mflags}
+gcc -v
+make %{?_smp_mflags} V=1
 
 %check
 make check
@@ -737,10 +713,12 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 %if ( 0%{!?_without_server:1} )
 %if ( 0%{_for_fedora_koji_builds} )
+%if ( 0%{!?_without_server:1} )
 install -D -p -m 0644 %{SOURCE1} \
     %{buildroot}%{_sysconfdir}/sysconfig/glusterd
 install -D -p -m 0644 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/sysconfig/glusterfsd
+%endif
 %else
 install -D -p -m 0644 extras/glusterd-sysconfig \
     %{buildroot}%{_sysconfdir}/sysconfig/glusterd
@@ -750,7 +728,7 @@ install -D -p -m 0644 extras/glusterd-sysconfig \
 mkdir -p %{buildroot}%{_localstatedir}/log/glusterd
 mkdir -p %{buildroot}%{_localstatedir}/log/glusterfs
 mkdir -p %{buildroot}%{_localstatedir}/log/glusterfsd
-mkdir -p %{buildroot}%{_rundir}/gluster
+mkdir -p %{buildroot}%{_rundir}/gluster/metrics
 
 # Remove unwanted files from all the shared libraries
 find %{buildroot}%{_libdir} -name '*.a' -delete
@@ -759,7 +737,7 @@ find %{buildroot}%{_libdir} -name '*.la' -delete
 # Remove installed docs, the ones we want are included by %%doc, in
 # /usr/share/doc/glusterfs or /usr/share/doc/glusterfs-x.y.z depending
 # on the distribution
-%if ( 0%{?fedora} && 0%{?fedora} > 19 ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
+%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 6 )
 rm -rf %{buildroot}%{_pkgdocdir}/*
 %else
 rm -rf %{buildroot}%{_defaultdocdir}/%{name}
@@ -769,7 +747,7 @@ head -50 ChangeLog > ChangeLog.head && mv ChangeLog.head ChangeLog
 cat << EOM >> ChangeLog
 
 More commit messages for this ChangeLog can be found at
-https://forge.gluster.org/glusterfs-core/glusterfs/commits/v%{version}%{?prereltag}
+https://forge.gluster.org/glusterfs-core/glusterfs/commits/v%{version}%{?dev}
 EOM
 
 # Remove benchmarking and other unpackaged files
@@ -832,30 +810,28 @@ find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glus
 %endif
 
 ## Install bash completion for cli
-install -p -m 0744 -D extras/command-completion/gluster.bash \
+install -p -m 0755 -D extras/command-completion/gluster.bash \
     %{buildroot}%{_sysconfdir}/bash_completion.d/gluster
 
-%clean
-rm -rf %{buildroot}
-
 ##-----------------------------------------------------------------------------
 ## All %%post should be placed here and keep them sorted
 ##
 %post
-/sbin/ldconfig
+%{?ldconfig}
 %if ( 0%{!?_without_syslog:1} )
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
+%if ( 0%{?fedora} ) || ( 0%{?rhel} )
 %systemd_postun_with_restart rsyslog
 %endif
 %endif
 exit 0
 
-%post api
-/sbin/ldconfig
+# post and postun scriptlets for api
+%ldconfig_scriptlets api
 
 %if ( 0%{!?_without_events:1} )
 %post events
 %systemd_post glustereventsd
+exit 0
 %endif
 
 %if ( 0%{!?_without_georeplication:1} )
@@ -866,8 +842,8 @@ fi
 exit 0
 %endif
 
-%post libs
-/sbin/ldconfig
+# post and postun scriptlets for libs
+%ldconfig_scriptlets libs
 
 %if ( 0%{!?_without_server:1} )
 %post server
@@ -998,22 +974,17 @@ fi
 ## All %%postun should be placed here and keep them sorted
 ##
 %postun
-/sbin/ldconfig
+%{?ldconfig}
 %if ( 0%{!?_without_syslog:1} )
-%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
+%if ( 0%{?fedora} ) || ( 0%{?rhel} )
 %systemd_postun_with_restart rsyslog
 %endif
 %endif
-
-%postun api
-/sbin/ldconfig
-
-%postun libs
-/sbin/ldconfig
+exit 0
 
 %if ( 0%{!?_without_server:1} )
 %postun server
-/sbin/ldconfig
+%{?ldconfig}
 %if (0%{?_with_firewalld:1})
     %firewalld_reload
 %endif
@@ -1021,7 +992,7 @@ exit 0
 %endif
 
 ##-----------------------------------------------------------------------------
-## All %%files should be placed here and keep them grouped
+## All %%files should be placed here and keep them sorted by groups
 ##
 %files
 %{!?_licensedir:%global license %%doc}
@@ -1033,9 +1004,9 @@ exit 0
 %endif
 %dir %{_localstatedir}/log/glusterfs
 %if ( 0%{!?_without_rdma:1} )
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma*
+%exclude %{_libdir}/glusterfs/%{version}%{?dev}/rpc-transport/rdma*
 %endif
-%if 0%{?!_without_server:1}
+%if ( 0%{!?_without_server:1} )
 %dir %{_datadir}/glusterfs
 %dir %{_datadir}/glusterfs/scripts
      %{_datadir}/glusterfs/scripts/post-upgrade-script-for-quota.sh
@@ -1043,47 +1014,48 @@ exit 0
 %endif
 # xlators that are needed on the client- and on the server-side
 %dir %{_libdir}/glusterfs
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/auth
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/auth/addr.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/auth/login.so
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/socket.so
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/error-gen.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/delay-gen.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/io-stats.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/sink.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/trace.so
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/access-control.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/barrier.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/cdc.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changelog.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/utime.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/gfid-access.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/namespace.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/read-only.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/shard.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-client.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/worm.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/cloudsync.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/meta.so
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-cache.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-threads.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/md-cache.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/open-behind.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/quick-read.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/read-ahead.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/readdir-ahead.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/stat-prefetch.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/write-behind.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/nl-cache.so
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/auth
+     %{_libdir}/glusterfs/%{version}%{?dev}/auth/addr.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/auth/login.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/rpc-transport
+     %{_libdir}/glusterfs/%{version}%{?dev}/rpc-transport/socket.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/error-gen.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/delay-gen.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/io-stats.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/sink.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/debug/trace.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/access-control.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/barrier.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/cdc.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/changelog.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/utime.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/gfid-access.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/namespace.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/read-only.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/shard.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/snapview-client.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/worm.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/cloudsync.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/meta.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/io-cache.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/io-threads.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/md-cache.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/open-behind.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/quick-read.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/read-ahead.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/readdir-ahead.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/stat-prefetch.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/write-behind.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/performance/nl-cache.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/system
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/system/posix-acl.so
 %dir %attr(0775,gluster,gluster) %{_rundir}/gluster
+%dir %attr(0775,gluster,gluster) %{_rundir}/gluster/metrics
 %if 0%{?_tmpfilesdir:1} && 0%{!?_without_server:1}
 %{_tmpfilesdir}/gluster.conf
 %endif
@@ -1092,9 +1064,8 @@ exit 0
 %exclude %{_libdir}/*.so
 # libgfapi files
 %{_libdir}/libgfapi.*
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/api.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mount
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mount/api.so
 
 %files api-devel
 %{_libdir}/pkgconfig/glusterfs-api.pc
@@ -1108,10 +1079,16 @@ exit 0
 %{_mandir}/man8/gluster.8*
 %{_sysconfdir}/bash_completion.d/gluster
 
+%files client-xlators
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/cluster
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/cluster/*.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/protocol
+%{_libdir}/glusterfs/%{version}%{?dev}/xlator/protocol/client.so
+
 %files cloudsync-plugins
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins/cloudsyncs3.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/cloudsync-plugins/cloudsynccvlt.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/cloudsync-plugins
+     %{_libdir}/glusterfs/%{version}%{?dev}/cloudsync-plugins/cloudsyncs3.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/cloudsync-plugins/cloudsynccvlt.so
 
 %files devel
 %dir %{_includedir}/glusterfs
@@ -1121,38 +1098,28 @@ exit 0
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libgfchangelog.pc
 
-%files client-xlators
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so
-
 %files extra-xlators
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quiesce.so
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/playground
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/playground/template.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/quiesce.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/playground
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/playground/template.so
 
 %files fuse
 # glusterfs is a symlink to glusterfsd, -server depends on -fuse.
 %{_sbindir}/glusterfs
 %{_sbindir}/glusterfsd
 %config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mount
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mount/fuse.so
 /sbin/mount.glusterfs
 %if ( 0%{!?_without_fusermount:1} )
 %{_bindir}/fusermount-glusterfs
 %endif
 
-%if ( 0%{?_with_gnfs:1} && 0%{!?_without_server:1} )
+%if ( 0%{?_with_gnfs:1} && 0%{!?_without_server:1} ) 
 %files gnfs
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs/server.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/nfs
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/nfs/*
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs
 %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run
@@ -1160,16 +1127,14 @@ exit 0
 %endif
 
 %files thin-arbiter
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/thin-arbiter.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/thin-arbiter.so
 %dir %{_datadir}/glusterfs/scripts
      %{_datadir}/glusterfs/scripts/setup-thin-arbiter.sh
 %config %{_sysconfdir}/glusterfs/thin-arbiter.vol
 
-%if ( 0%{?_with_systemd:1} )
 %{_unitdir}/gluster-ta-volume.service
-%endif
 
 
 %if ( 0%{!?_without_georeplication:1} )
@@ -1192,6 +1157,7 @@ exit 0
      %{_libexecdir}/glusterfs/peer_georep-sshkey.py*
 %{_sbindir}/gluster-georep-sshkey
 
+
        %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/geo-replication
 %ghost      %attr(0644,-,-) %{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf
        %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/gsync-create
@@ -1212,6 +1178,7 @@ exit 0
 %files libs
 %{_libdir}/*.so.*
 %exclude %{_libdir}/libgfapi.*
+# libgfdb is only needed server-side
 
 %files -n python%{_pythonver}-gluster
 # introducing glusterfs module in site packages.
@@ -1229,15 +1196,16 @@ exit 0
 
 %if ( 0%{!?_without_rdma:1} )
 %files rdma
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/rpc-transport/rdma*
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/rpc-transport
+     %{_libdir}/glusterfs/%{version}%{?dev}/rpc-transport/rdma*
 %endif
 
 %if ( ! 0%{_for_fedora_koji_builds} )
 %files regression-tests
-%dir %{_datadir}/glusterfs
-     %{_datadir}/glusterfs/run-tests.sh
-     %{_datadir}/glusterfs/tests
+%dir %{_prefix}/share/glusterfs
+     %{_prefix}/share/glusterfs/run-tests.sh
+%dir %{_prefix}/share/glusterfs/tests
+     %{_datadir}/glusterfs/tests/*
 %exclude %{_datadir}/glusterfs/tests/vagrant
 %endif
 
@@ -1257,7 +1225,7 @@ exit 0
 %exclude %{_sharedstatedir}/glusterd/nfs/nfs-server.vol
 %exclude %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
 %if ( 0%{?_with_gnfs:1} )
-%exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs/*
+%exclude %{_libdir}/glusterfs/%{version}%{?dev}/xlator/nfs/*
 %endif
 %config(noreplace) %{_sysconfdir}/sysconfig/glusterd
 %if ( 0%{_for_fedora_koji_builds} )
@@ -1269,9 +1237,7 @@ exit 0
 %if ( 0%{_for_fedora_koji_builds} )
 %glusterfsd_svcfile
 %endif
-%if ( 0%{?_with_systemd:1} )
 %glusterfssharedstorage_svcfile
-%endif
 
 # binaries
 %{_sbindir}/glusterd
@@ -1285,29 +1251,27 @@ exit 0
 # Manpages
 %{_mandir}/man8/gluster-setgfid2path.8*
 
-# xlators
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/sdfs.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/index.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/locks.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/posix*
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-server.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/marker.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/quota*
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/selinux.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/trash.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/upcall.so
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/leases.so
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt/glusterd.so
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server.so
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage
-     %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/posix.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/arbiter.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/bit-rot.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/bitrot-stub.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/sdfs.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/index.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/locks.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/posix*
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/snapview-server.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/marker.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/quota*
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/selinux.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/trash.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/upcall.so
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/features/leases.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mgmt
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/mgmt/glusterd.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/protocol
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/protocol/server.so
+%dir %{_libdir}/glusterfs/%{version}%{?dev}/xlator/storage
+     %{_libdir}/glusterfs/%{version}%{?dev}/xlator/storage/posix.so
 
 # snap_scheduler
 %{_sbindir}/snap_scheduler.py
@@ -1371,7 +1335,7 @@ exit 0
        %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre
             %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S30samba-stop.sh
             %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh
-%config(noreplace) %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
+%config(noreplace) %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/quotad
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/scrub
@@ -1380,23 +1344,23 @@ exit 0
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols
 
 # Extra utility script
-%dir %{_libexecdir}/glusterfs
+%dir %{_datadir}/glusterfs
 %dir %{_datadir}/glusterfs/scripts
-     %{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh
-%if ( 0%{?_with_systemd:1} )
+%{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh
      %{_libexecdir}/glusterfs/mount-shared-storage.sh
      %{_datadir}/glusterfs/scripts/control-cpu-load.sh
      %{_datadir}/glusterfs/scripts/control-mem.sh
-%endif
 
 # Incrementalapi
+%dir %{_libexecdir}/glusterfs
      %{_libexecdir}/glusterfs/glusterfind
-%{_bindir}/glusterfind
      %{_libexecdir}/glusterfs/peer_add_secret_pub
+%{_bindir}/glusterfind
 
 %if ( 0%{?_with_firewalld:1} )
 %{_prefix}/lib/firewalld/services/glusterfs.xml
 %endif
+
 # end of server files
 %endif
 
@@ -1407,212 +1371,282 @@ exit 0
 %dir %{_sharedstatedir}/glusterd
 %dir %{_sharedstatedir}/glusterd/events
 %dir %{_libexecdir}/glusterfs
-     %{_libexecdir}/glusterfs/gfevents
+%dir %{_libexecdir}/glusterfs/gfevents
+     %{_libexecdir}/glusterfs/gfevents/*
      %{_libexecdir}/glusterfs/peer_eventsapi.py*
 %{_sbindir}/glustereventsd
 %{_sbindir}/gluster-eventsapi
 %{_datadir}/glusterfs/scripts/eventsdash.py*
-%if ( 0%{?_with_systemd:1} )
 %{_unitdir}/glustereventsd.service
-%else
-%{_sysconfdir}/init.d/glustereventsd
-%endif
 %endif
 
 %changelog
-* Wed Jan 15 2020 Niels de Vos <ndevos@redhat.com> - 7.2-1
-- GlusterFS 7.2 GA
+* Wed Jan 15 2020  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 7.2-1
+- 7.2 GA
+
+* Mon Dec 23 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 7.1-1
+- 7.1 GA
+
+* Tue Oct 15 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 7.0-1
+- 7.0 GA
+
+* Wed Oct 9 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
+- bd xlator was removed in glusterfs-6
 
-* Tue Dec 24 2019 Niels de Vos <ndevos@redhat.com> - 7.1-1
-- GlusterFS 7.1 GA
-- remove leftover bd xlator cruft
+* Tue Oct 1 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 7.0-0.5rc3
+- 7.0 RC3 (note, rc2 was tagged but not released)
 
-* Wed Oct 16 2019 Niels de Vos <ndevos@redhat.com> - 7.0-1
-- GlusterFS 7.0 GA
+* Mon Sep 16 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 7.0-0.4rc1
+- disable gnfs by default
 
-* Mon Sep 16 2019 Niels de Vos <ndevos@redhat.com> - 7.0-0.1.rc1
-- GlusterFS 7.0 Release Candidate 1
+* Mon Sep 16 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 7.0-0.3rc1
+- 7.0 RC1
 
-* Wed Aug 28 2019 Niels de Vos <ndevos@redhat.com> - 7.0-0.1.rc0
-- GlusterFS 7.0 Release Candidate 0
-- always build glusterfs-cli to allow monitoring/managing from clients
+* Wed Aug 28 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 7.0-0.2rc0
+- python3-requests, el-8
 
-* Wed Aug 7 2019 Niels de Vos <ndevos@redhat.com> - 6.5-1
+* Thu Aug 22 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 7.0-0.1rc0
+- 7.0 RC0
+
+* Mon Aug 19 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.5-2
+- Rebuilt for Python 3.8, again
+
+* Mon Aug 19 2019 Miro HronĨok <mhroncok@redhat.com> - 6.5-1.1
+- Rebuilt for Python 3.8
+
+* Wed Aug 7 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.5-1
 - 6.5 GA
 
-* Wed Jul 17 2019 Niels de Vos <ndevos@redhat.com> - 6.4-1
+* Thu Aug 1 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.4-3
+- restore i686 
+
+* Thu Aug 1 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.4-2
+- temporarily exclude i686 pending firewalld resolution
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 6.4-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Wed Jul 17 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.4-1
 - 6.4 GA
 
-* Tue Jun 11 2019 Niels de Vos <ndevos@redhat.com> - 6.3-1
+* Wed Jul 17 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.4-1
+- 6.4 GA
+
+* Tue Jun 11 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.3-1
 - 6.3 GA
 
-* Wed May 29 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.2-1
+* Fri May 24 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.2-1
 - 6.2 GA
 
-* Wed Apr 17 2019 Niels de Vos <ndevos@redhat.com> - 6.1-1
+* Mon Apr 22 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.1-2
+- 6.1 GA, glusterfs-thin-arbiter Requires: glusterfs-libs
+
+* Wed Apr 17 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.1-1
 - 6.1 GA
 
-* Wed Mar 20 2019 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.0-1
+* Wed Mar 20 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.0-1
 - 6.0 GA
 
-* Wed Mar 13 2019 Niels de Vos <ndevos@redhat.com> - 6.0-0.1.rc1
-- 6.0 Release Candidate 1
-- s390x has RDMA, since around Fedora 27 and in RHEL7 since June 2016
+* Wed Mar 13 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.0rc1-0.4
+- 6.0 RC1
+
+* Wed Mar 6 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.0rc0-0.3
+- 6.0 RC0
+-  restore s390x rdma
+-  remove obsolete scripts from 
+-   https://src.fedoraproject.org/rpms/glusterfs/pull-request/5
+
+* Fri Mar 1 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.0rc0-0.2
+- 6.0 RC0, s390x, armv7hl no rdma
+
+* Fri Feb 22 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 6.0rc0-0.1
+- 6.0 RC0
 
-* Fri Feb 22 2019 Niels de Vos <ndevos@redhat.com> - 6.0-0.1.rc0
-- 6.0 Release Candidate 0
-- Install /var/lib/glusterd/groups/distributed-virt by default
-- Add an option to build with ThreadSanitizer (TSAN)
-- Obsoleting gluster-gnfs package
+* Wed Feb 20 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.3-2
+- re-rebuild for f31/rawhide
 
-* Thu Jan 17 2019 Niels de Vos <ndevos@redhat.com> - 5.3-1
+* Wed Feb 20 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.3-1
+- rebuild for f31/rawhide
+
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5.3-2.1
+- Rebuild for readline 8.0
+
+* Thu Feb 14 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.3-2
+- Re-rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.3-1.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jan 17 2019  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.3-1
 - 5.3 GA
 
-* Thu Dec 13 2018 Niels de Vos <ndevos@redhat.com> - 5.2-1
+* Thu Dec 13 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.2-1
 - 5.2 GA
 
-* Thu Nov 15 2018 Niels de Vos <ndevos@redhat.com> - 5.1-1
+* Wed Nov 14 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.1-1
 - 5.1 GA
 
-* Fri Oct 19 2018 Niels de Vos <ndevos@redhat.com> - 5.0-1
-- 5.0 General Availability
+* Thu Oct 18 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.0-1
+- 5.0 GA
+
+* Fri Oct 5 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.0-0.5.rc1
+- 5.0 RC1
 
-* Mon Oct 8 2018 Niels de Vos <ndevos@redhat.com> - 5.0-0.1.rc1
-- 5.0 Release Candidate 1
+* Mon Sep 24 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.0-0.3.rc0
+- 5.0 RC0, unbork python shebangs
 
-* Tue Sep 18 2018 Niels de Vos <ndevos@redhat.com> - 5.0-0.1.rc0
-- 5.0 Release Candidate 0
-- Add an option to build with address sanitizer (ASAN)
-- Disable building glusterfs-resource-agents on el6 (#1609551)
+* Thu Sep 20 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.0-0.2.rc0
+- 5.0 RC0
 
-* Thu Sep 6 2018 Niels de Vos <ndevos@redhat.com> - 4.1.4-1
+* Tue Sep 18 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.0-0.1.rc0
+- 5.0 RC0
+
+* Thu Sep 6 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.4-1
 - 4.1.4 GA
 
-* Mon Aug 27 2018 Niels de Vos <ndevos@redhat.com> - 4.1.3-1
+* Tue Sep 4 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.3-2
+- missing /run/gluster/metrics, see bz#1624006
+
+* Tue Sep 4 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
+- --with-ipv6-default bz#1614769
+
+* Mon Aug 27 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.3-1
 - 4.1.3 GA
 
-* Tue Jul 24 2018 Niels de Vos <ndevos@redhat.com> - 4.1.2-1
+* Wed Jul 25 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.2-3
+- 4.1.2, again
+
+* Tue Jul 24 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.2-2
+- 4.1.2, gsyncd.conf /usr/local/sbin 
+
+* Tue Jul 24 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.2-1
 - 4.1.2 GA
 
-* Mon Jun 25 2018 Niels de Vos <ndevos@redhat.com> - 4.1.1-1
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.1-2.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.1-2
+- missed python->python2 in shebang
+
+* Tue Jun 26 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.1-1
 - 4.1.1 GA
 
-* Tue Jun 12 2018 Niels de Vos <ndevos@redhat.com> - 4.1.0-1
-- 4.1.0 General Availability
+* Tue Jun 12 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.0-1
+- 4.1.0 GA
 
-* Sat Jun 2 2018 Niels de Vos <ndevos@redhat.com> - 4.1.0-0.1.rc0
-- 4.1.0 Release Candidate 0
+* Fri Jun 1 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.0rc0
+- 4.1.0 RC0
 
 * Tue Apr 24 2018 Niels de Vos <ndevos@redhat.com> - 4.0.2-1
 - 4.0.2 GA
 
-* Wed Mar 21 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.1-1
+* Thu Apr 19 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.1-3
+- 4.0.1, restore python->python2 -prettytable
+
+* Wed Mar 21 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.1-2
 - 4.0.1 GA
 
-* Mon Mar 12 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-2
+* Wed Mar 21 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.1-1
+- (skipped by accident)
+
+* Tue Mar 6 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-2
 - 4.0.0 GA (v4.0.0-2 respin)
 
-* Tue Mar 6 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-1
+* Tue Mar 6 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-1
 - 4.0.0 GA
 
-* Tue Feb 27 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-0.1.rc1
-- 4.0.0 Release Candidate 1
+* Thu Mar 1 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-0.2rc1
+- 4.0.0 RC1, python2-prettytable, .../rpms/glusterfs/pull-request/3
 
-* Thu Feb 22 2018 Kotresh HR <khiremat@redhat.com>
-- Added util-linux as dependency to georeplication rpm (#1544382)
-
-* Thu Feb 1 2018 Niels de Vos <ndevos@redhat.com> - 4.0.0-0.1.rc0
-- 4.0.0 Release Candidate 0
-- Fedora 28 has renamed pyxattr
-- Added control-cpu-load.sh and control-mem.sh scripts to glusterfs-server section(#1496335)
-- libibverbs-devel, librdmacm-devel -> rdma-core-devel #1483995
+* Tue Feb 27 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0-0.1rc1
+- 4.0.0 RC1
 
-* Tue Jan 23 2018 Niels de Vos <ndevos@redhat.com> - 3.13.2-2
-- rebuild for updated userspace-rcu
+* Fri Feb 2 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.0.0rc0-1
+- 4.0.0 RC0
 
-* Sat Jan 20 2018 Niels de Vos <ndevos@redhat.com> - 3.13.2-1
+* Sat Jan 20 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.13.2-1
 - 3.13.2 GA
 
-* Thu Dec 21 2017 Niels de Vos <ndevos@redhat.com> - 3.13.1-1
+* Thu Jan 18 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.13.1-3
+- glibc in Fedora 28 has removed rpc headers and rpcgen, use libtirpc
+
+* Mon Dec 25 2017 Niels de Vos <ndevos@redhat.com> - 3.13.1-2
+- Fedora 28 has renamed pyxattr
+
+* Thu Dec 21 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.13.1-1
 - 3.13.1 GA
 
-* Sun Dec 3 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.13.0-1
+* Sat Dec 2 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.13.0-1
 - 3.13.0 GA
 
-* Wed Nov 22 2017 Niels de Vos <ndevos@redhat.com> - 3.13.0-0.1.rc0
-- 3.13.0 Release Candidate 0
+* Wed Nov 22 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.13.0-0.1.rc0
+- 3.13.0 RC0
 
-* Wed Nov 22 2017 Niels de Vos <ndevos@redhat.com> - 3.12.3-1
+* Mon Nov 13 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.12.3-1
 - 3.12.3 GA
-- revert JWT signing support for eventsapi
 
-* Tue Oct 31 2017 Niels de Vos <ndevos@redhat.com> - 3.12.2-2
-* gfapi: set lkowner in glfd (bz#1501956)
+* Mon Oct 23 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.12.2-2
+- 3.12.2, bz #1504256
 
-* Fri Oct 13 2017 Niels de Vos <ndevos@redhat.com> - 3.12.2-1
+* Fri Oct 13 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.12.2-1
 - 3.12.2 GA
 
-* Wed Sep 27 2017 Niels de Vos <ndevos@redhat.com> - 2.12.1-2
-- cli: Bypass the confirmation question creating replica 2 volume with force (bz#1495858)
+* Thu Sep 28 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.12.1-2
+- 3.12.1 bz 1495858
 
-* Mon Sep 11 2017 Niels de Vos <ndevos@redhat.com> - 3.12.1-1
+* Mon Sep 11 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.12.1-1
 - 3.12.1 GA
 
-* Wed Aug 30 2017 Niels de Vos <ndevos@redhat.com> - 3.12.0-1
-- 3.12.0 Release Candidate GA
-- Added new tool/binary to set the gfid2path xattr on files
-- libibverbs-devel, librdmacm-devel -> rdma-core-devel
+* Wed Aug 30 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.12.0-1
+- 3.12.0 GA
 
-* Wed Aug 16 2017 Niels de Vos <ndevos@redhat.com> - 3.12.0-0.1rc0_1
-- rebuilt for new userspace-rcu
+* Tue Aug 22 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.3-2
+- 3.11.3 libibverbs-devel, librdmacm-devel -> rdma-core-devel
 
-* Thu Aug 10 2017 Niels de Vos <ndevos@redhat.com> - 3.12.0-0.rc0
-- 3.12.0 Release Candidate 0
-- various directories not owned by any package
-- Add glusterfssharedstorage.service systemd file
+* Mon Aug 21 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.3-1
+- 3.11.3 GA
 
-* Sat Jul 22 2017 Niels de Vos <ndevos@redhat.com> - 3.11.2-1
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Jul 21 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.2-1
 - 3.11.2 GA
 
-* Tue Jun 27 2017 Niels de Vos <ndevos@redhat.com> - 3.11.1-1
+* Fri Jul 07 2017 Igor Gnatenko <ignatenko@redhat.com> - 3.11.1-2
+- Rebuild due to bug in RPM (RHBZ #1468476)
+
+* Wed Jun 28 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.1-1
 - 3.11.1 GA
-- Install /var/lib/glusterd/groups/nl-cache by default
 
-* Mon Jun 19 2017 Niels de Vos <ndevos@redhat.com> - 3.11.0-2
-- Build the glusterfs-gnfs sub-package
+* Sun Jun 25 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.0-2
+- rebuild with userspace-rcu-0.10.0 (liburcu-bp.so.6)
 
-* Tue May 30 2017 Niels de Vos <ndevos@redhat.com> - 3.11.0
+* Tue May 30 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.0-1
 - 3.11.0 GA
-- Install /var/lib/glusterd/groups/gluster-block by default
-
-* Tue May 30 2017 Niels de Vos <ndevos@redhat.com> - 3.11.0rc1
-- 3.11.0 Release Candidate 1
-
-* Tue May 16 2017 Niels de Vos <ndevos@redhat.com> - 3.11.0rc0
-- 3.11.0 Release Candidate 0
-- gnfs in an optional subpackage
-- /var/run/gluster owner gluster:gluster(0775) for qemu(gfapi)
-  statedumps (#1445569)
-- Install SELinux hook scripts that manage contexts for bricks (#1047975)
-- firewalld-filesystem -> firewalld (#1443959)
-- the -regression-tests sub-package needs "bc" for some tests (#1442145)
-- Drop dependency on psmisc, pkill is used instead of killall (#1197308)
-- remove ganesha (#1418417)
-
-* Mon May 15 2017 Niels de Vos <ndevos@redhat.com> - 3.10.2
-- 3.10.2 GA
-
-* Fri Mar 31 2017 Niels de Vos <ndevos@redhat.com> - 3.10.1
+
+* Tue May 23 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.0-0.4rc1
+- 3.11.0 RC1
+
+* Tue May 9 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.0-0.3rc0
+- Enable gnfs subpackage
+
+* Tue May 9 2017  Niels de Vos <ndevos@redhat.com> - 3.11.0-0.2rc0
+- remove conflicting _localstate_/run/gluster dir
+
+* Mon May 8 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.11.0-0.1rc0
+- 3.11.0 RC0
+
+* Thu Mar 30 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.1-1
 - 3.10.1 GA
 
-* Fri Feb 24 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.01
+* Thu Feb 23 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.0-1
 - 3.10.0 GA
 
-* Wed Feb 22 2017 Niels de Vos <ndevos@redhat.com>
+* Tue Feb 21 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.0-0.2rc1
 - 3.10.0 RC1
-- Obsolete and Provide python-gluster for upgrading from glusterfs < 3.10
-- revert switch to storhaug HA
-- Install /var/lib/glusterd/groups/metadata-cache by default
 
 * Tue Feb 7 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.10.0-0.1rc0
 - 3.10.0 RC0
@@ -1679,7 +1713,7 @@ exit 0
 - 3.8.0 RC1
 
 * Wed Apr 27 2016  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.7.11-2
-- %postun libs on RHEL6 w/o firewalld
+- %%postun libs on RHEL6 w/o firewalld
 
 * Mon Apr 18 2016  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.7.11-1
 - GlusterFS 3.7.11 GA