From 117ae4f966a66e49bb0edea61042ae473c5c0fd9 Mon Sep 17 00:00:00 2001
From: Lalatendu Mohanty <lmohanty@redhat.com>
Date: Tue, 22 Jul 2014 00:22:46 +0530
Subject: [PATCH] GlusterFS 3.5.2 beta1

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

diff --git a/glusterfs.spec b/glusterfs.spec
index 0292249..cff7f69 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -3,7 +3,7 @@
 %global _for_fedora_koji_builds 1
 
 # uncomment and add '%' to use the prereltag for pre-releases
-# %%global prereltag beta2
+%global prereltag beta1
 
 # if you wish to compile an rpm without rdma support, compile like this...
 # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma
@@ -80,8 +80,8 @@
 Summary:          Cluster File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
-Version:          3.5.1
-Release:          2%{?prereltag:.%{prereltag}}%{?dist}
+Version:          3.5.2
+Release:          0.1%{?prereltag:.%{prereltag}}%{?dist}
 Vendor:           Fedora Project
 %else
 Name:             @PACKAGE_NAME@
@@ -315,6 +315,8 @@ Requires:         %{name} = %{version}-%{release}
 Requires:         %{name}-cli = %{version}-%{release}
 Requires:         %{name}-libs = %{version}-%{release}
 Requires:         %{name}-fuse = %{version}-%{release}
+#nfs-utils provides rpc.statd and it is a requirement for gluster-nfs
+Requires:         nfs-utils
 %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 )
 Requires:         rpcbind
 %else
@@ -940,7 +942,7 @@ pidof -c -o %PPID -x glusterd &> /dev/null
 if [ $? -eq 0 ]; then
     kill -9 `pgrep -f gsyncd.py` &> /dev/null
 
-    killall glusterd &> /dev/null
+    killall --wait glusterd &> /dev/null
     glusterd --xlator-option *.upgrade=on -N
 else
     glusterd --xlator-option *.upgrade=on -N
@@ -965,9 +967,18 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
+* Mon Jul 21 2014 Lalatendu Mohanty <lmohanty[at]redhat.com> - 3.5.2-0.1.beta1
+- GlusterFS 3.5.2 beta1
+
 * Wed Jul 9 2014 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.5.1-2
 - glusterd.init, BZ 1073217
 
+* Fri Jun 27 2014 Kaleb S. KEITHLEY <kkeithle@redhat.com>
+- killall --wait in %%post server (#1113959, #1113745)
+
+* Wed Jun 25 2014 Vikhyat Umrao <vumrao@redhat.com>
+- add nfs-utils package dependency for server package (#1113007)
+
 * Tue Jun 24 2014 Lalatendu Mohanty <lmohanty[at]redhat.com> - 3.5.1-1
 - GlusterFS 3.5.1 GA
 
diff --git a/sources b/sources
index 9e8a9d0..107b860 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a68114c60a7d35831657116a68a42040  glusterfs-3.5.1.tar.gz
+69d696eb51626d1e714b5375d7f47dd8  glusterfs-3.5.2beta1.tar.gz