From 8d7270b3d4314cb96335a653253f7bd56f753c80 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Wed, 30 Aug 2017 10:01:16 -0400
Subject: [PATCH] 3.12.0 GA

---
 glusterfs.spec | 28 +++++++++++++++++-----------
 sources        |  2 +-
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/glusterfs.spec b/glusterfs.spec
index ce21841..3f3a749 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -112,8 +112,6 @@
 %{!?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
-%else
-%global _rundir /run
 %endif
 
 %if ( 0%{?_with_systemd:1} )
@@ -131,6 +129,7 @@
 %global _init_glusterd   %{_unitdir}/glusterd.service
 %global _init_glusterfsd %{_unitdir}/glusterfsd.service
 %global _init_glustereventsd %{_unitdir}/glustereventsd.service
+%global _init_glusterfssharedstorage %{_unitdir}/glusterfssharedstorage.service
 %else
 %global _init_enable()  /sbin/chkconfig --add %1 ;
 %global _init_disable() /sbin/chkconfig --del %1 ;
@@ -182,8 +181,8 @@
 Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
-Version:          3.11.3
-Release:          2%{?prereltag:.%{prereltag}}%{?dist}
+Version:          3.12.0
+Release:          1%{?prereltag:.%{prereltag}}%{?dist}
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
@@ -1089,10 +1088,8 @@ exit 0
 %{_sysconfdir}/bash_completion.d/gluster
 
 %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
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol
 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so
 
@@ -1104,7 +1101,6 @@ exit 0
 %exclude %{_libdir}/libgfapi.so
 %{_libdir}/*.so
 # Glupy Translator examples
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/glupy/debug-trace.*
@@ -1116,7 +1112,6 @@ exit 0
 %endif
 
 %files extra-xlators
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/rot-13.so
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
@@ -1137,7 +1132,6 @@ exit 0
 %{_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
 /sbin/mount.glusterfs
@@ -1152,7 +1146,6 @@ exit 0
 
 %if ( 0%{?_with_gnfs:1} )
 %files gnfs
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs/*
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs
@@ -1256,15 +1249,22 @@ exit 0
 %if ( 0%{_for_fedora_koji_builds} )
 %_init_glusterfsd
 %endif
+%if ( 0%{?_with_systemd:1} )
+%_init_glusterfssharedstorage
+%endif
 
 # binaries
 %{_sbindir}/glusterd
 %{_sbindir}/glfsheal
 %{_sbindir}/gf_attach
+%{_sbindir}/gluster-setgfid2path
 # {_sbindir}/glusterfsd is the actual binary, but glusterfs (client) is a
 # symlink. The binary itself (and symlink) are part of the glusterfs-fuse
 # package, because glusterfs-server depends on that anyway.
-%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator
+
+# Manpages
+%{_mandir}/man8/gluster-setgfid2path.8*
+
 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so
      %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so
@@ -1362,6 +1362,9 @@ exit 0
 %dir %{_datadir}/glusterfs
 %dir %{_datadir}/glusterfs/scripts
 %{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh
+%if ( 0%{?_with_systemd:1} )
+     %{_libexecdir}/glusterfs/mount-shared-storage.sh
+%endif
 
 # Incrementalapi
 %dir %{_libexecdir}/glusterfs
@@ -1394,6 +1397,9 @@ exit 0
 %endif
 
 %changelog
+* Wed Aug 30 2017  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.12.0-1
+- 3.12.0 GA
+
 * 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
 
diff --git a/sources b/sources
index ad79895..9bb5743 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glusterfs-3.11.3.tar.gz) = a4ef8717873283fce6bc21ef5c6950e92706b473c1148e7d3e82bf57b348d70bcb3c8e6744aa3aed3a4f036869383d99cd29c21bd7b67b478a958ea374165eb6
+SHA512 (glusterfs-3.12.0.tar.gz) = 49d8925f3a59e2fce561d1dede3807f2df3822377b6c06c60f95dd8e2798335dc552068341a3d5e6152f7f98992fb7dc7df9634db59c6575327de57f6bf20e47