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

This commit is contained in:
Kaleb S. KEITHLEY 2014-09-25 07:42:46 -04:00
parent 9460531047
commit ac19e6ebd9

View File

@ -149,7 +149,7 @@ Vendor: Fedora Project
%else %else
Name: @PACKAGE_NAME@ Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@ Version: @PACKAGE_VERSION@
Release: 2%{?dist} Release: 0.@PACKAGE_RELEASE@%{?dist}
Vendor: glusterfs.org Vendor: glusterfs.org
%endif %endif
License: GPLv2 or LGPLv3+ License: GPLv2 or LGPLv3+
@ -415,6 +415,7 @@ Requires: %{name}-server = %{version}-%{release}
## thin provisioning support ## thin provisioning support
Requires: lvm2 >= 2.02.89 Requires: lvm2 >= 2.02.89
Requires: perl(App::Prove) perl(Test::Harness) gcc util-linux-ng 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 Requires: nfs-utils xfsprogs yajl
%description regression-tests %description regression-tests
@ -1010,8 +1011,6 @@ fi
# This is really ugly, but I have no idea how to mark these directories in # 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 # any other way. They should belong to the glusterfs-server package, but
# don't exist after installation. They are generated on the first start... # 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/stop/post
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/pre %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/start/pre
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick