From c12fb1372cac64c4592253aa3da03e9d9bbee4e2 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Mon, 1 Jun 2015 13:16:02 -0400
Subject: [PATCH] GlusterFS 3.7.1 GA

---
 glusterfs.spec | 23 +++++++++++++++++++----
 sources        |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/glusterfs.spec b/glusterfs.spec
index f0916e8..3c33bb9 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -159,14 +159,14 @@
 Summary:          Cluster File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
-Version:          3.7.0
-Release:          2%{?prereltag:.%{prereltag}}%{?dist}
+Version:          3.7.1
+Release:          1%{?prereltag:.%{prereltag}}%{?dist}
 Vendor:           Fedora Project
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
 Release:          0.@PACKAGE_RELEASE@%{?dist}
-Vendor:           glusterfs.org
+Vendor:           gluster.org
 %endif
 License:          GPLv2 or LGPLv3+
 Group:            System Environment/Base
@@ -880,11 +880,20 @@ if [ $? -eq 0 ]; then
 
     killall --wait glusterd &> /dev/null
     glusterd --xlator-option *.upgrade=on -N
+
+    #Cleaning leftover glusterd socket file which is created by glusterd in
+    #rpm_script_t context.
+    rm -rf /var/run/glusterd.socket
+
     # glusterd _was_ running, we killed it, it exited after *.upgrade=on,
     # so start it again
     %_init_start glusterd
 else
     glusterd --xlator-option *.upgrade=on -N
+
+    #Cleaning leftover glusterd socket file which is created by glusterd in
+    #rpm_script_t context.
+    rm -rf /var/run/glusterd.socket
 fi
 
 ##-----------------------------------------------------------------------------
@@ -1059,7 +1068,6 @@ fi
 %{_libexecdir}/glusterfs/python/syncdaemon/*
 %{_libexecdir}/glusterfs/gverify.sh
 %{_libexecdir}/glusterfs/set_geo_rep_pem_keys.sh
-%{_libexecdir}/glusterfs/peer_add_secret_pub
 %{_libexecdir}/glusterfs/peer_gsec_create
 %{_libexecdir}/glusterfs/peer_mountbroker
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/geo-replication
@@ -1206,12 +1214,19 @@ fi
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run
 %ghost      %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid
 
+# Extra utility script
+%{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh
+
 # Incrementalapi
 %{_libexecdir}/glusterfs/glusterfind
 %{_bindir}/glusterfind
+%{_libexecdir}/glusterfs/peer_add_secret_pub
 
 
 %changelog
+* Mon Jun 1 2015  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.7.1-1
+- GlusterFS 3.7.1 GA
+
 * Wed May 20 2015  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.7.0-2
 - GlusterFS 3.7.0, move lib{gfdb,gfchangelog}.pc from -api-devel to -devel
 
diff --git a/sources b/sources
index dc100cd..fdb396f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d7b856a06c40b560860da9dc416bb007  glusterfs-3.7.0.tar.gz
+0b565f92a467f5aafab38c8343f0caa0  glusterfs-3.7.1.tar.gz