[glusterfs] synch a couple minor diffs with upstream in prep for next beta

[Kaleb S. KEITHLEY]

commit ac19e6ebd9e03360c8ef77d9d40b560a2b463c94
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Thu Sep 25 07:42:46 2014 -0400

    synch a couple minor diffs with upstream in prep for next beta

 glusterfs.spec |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/glusterfs.spec b/glusterfs.spec
index cce43ea..9aa7127 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -149,7 +149,7 @@ Vendor:           Fedora Project
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
-Release:          2%{?dist}
+Release:          0. at PACKAGE_RELEASE@%{?dist}
 Vendor:           glusterfs.org
 %endif
 License:          GPLv2 or LGPLv3+
@@ -415,6 +415,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 attr dbench file git libacl-devel mock net-tools
 Requires:         nfs-utils xfsprogs yajl
 
 %description regression-tests
@@ -1010,8 +1011,6 @@ fi
 # This is really ugly, but I have no idea how to mark these directories in
 # any other way. They should belong to the glusterfs-server package, but
 # don't exist after installation. They are generated on the first start...
-#%%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks
-#%%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/post
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/pre
 %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick