From 52a440ffb4cc2bcf3ec1a40e859b8f319a132e4f Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Tue, 18 Sep 2012 10:18:23 -0400
Subject: [PATCH] 3.3.0-9, fixes for glusterfsd.init and build issues with
 python-paste-deploy on rhel6

---
 glusterfs.spec  | 8 ++++++--
 glusterfsd.init | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/glusterfs.spec b/glusterfs.spec
index 899f504..0d915d4 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -32,7 +32,7 @@
 Summary:          Cluster File System
 Name:             glusterfs
 Version:          3.3.0
-Release:          8%{?dist}
+Release:          9%{?dist}
 License:          GPLv3+ and (GPLv2 or LGPLv3+)
 Group:            System Environment/Base
 Vendor:           Red Hat
@@ -234,16 +234,17 @@ BuildRequires:    python-netifaces
 %if ( 0%{?rhel} && 0%{?rhel} < 7 )
 BuildRequires:    python-webob1.0
 BuildRequires:    python-paste-deploy1.5
+Requires:         python-paste-deploy1.5
 %else
 BuildRequires:    python-webob
 BuildRequires:    python-paste-deploy
+Requires:         python-paste-deploy
 %endif
 BuildRequires:    dos2unix
 Requires:         %{name} = %{version}-%{release}
 Requires:         python-configobj
 Requires:         python-eventlet >= 0.9.8
 Requires:         python-greenlet >= 0.3.1
-Requires:         python-paste-deploy
 Requires:         python-simplejson
 Requires:         pyxattr
 Requires:         python-setuptools
@@ -904,6 +905,9 @@ fi
 
 
 %changelog
+* Tue Sep 18 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.0-9
+- python-paste-deploy on RHEL 6, glusterfsd.init
+
 * Wed Sep 13 2012 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.3.0-8
 - fix for glusterfs SEGV, BZ 856704, revised
 
diff --git a/glusterfsd.init b/glusterfsd.init
index 951c18d..a4b1b55 100644
--- a/glusterfsd.init
+++ b/glusterfsd.init
@@ -32,7 +32,7 @@ lockfile=/var/lock/subsys/$prog
 
 start() {
     [ -x $exec ] || exit 5
-    [ $GLUSTERFSD_CONFIG -o -f $GLUSTERFSD_CONFIG ] || exit 6
+    [ $GLUSTERFSD_CONFIG -a -f $GLUSTERFSD_CONFIG ] || exit 6
     ulimit -n $GLUSTERFSD_NOFILE
     echo -n $"Starting $prog: "
     daemon $exec${GLUSTERFSD_CONFIG+" -f $GLUSTERFSD_CONFIG"}${GLUSTERFSD_LOGFILE+" -l $GLUSTERFSD_LOGFILE"}${GLUSTERFSD_LOGLEVEL+" -L $GLUSTERFSD_LOGLEVEL"} -p /var/run/glusterfsd.pid