diff --git a/glusterfs.spec b/glusterfs.spec index fb3b08d..9fc84e6 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -33,7 +33,7 @@ Summary: Cluster File System Name: glusterfs Version: 3.3.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv3+ and (GPLv2 or LGPLv3+) Group: System Environment/Base Vendor: Red Hat @@ -95,6 +95,8 @@ BuildRequires: bison flex BuildRequires: gcc make automake libtool BuildRequires: ncurses-devel readline-devel BuildRequires: libxml2-devel openssl-devel +BuildRequires: libaio-devel +#BuildRequires: systemtap-sdt-devel lvm2-devel # glusterfs-3.4.x %if 0%{?suse_version} BuildRequires: python-devel %else @@ -534,6 +536,7 @@ touch %{buildroot}%{_sharedstatedir}/glusterd/geo-replication/gsyncd.conf # the rest of the ghosts touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info +touch %{buildroot}%{_sharedstatedir}/glusterd/options %{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks %{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1 %{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/stop @@ -558,9 +561,12 @@ touch %{buildroot}%{_sharedstatedir}/glusterd/glusterd.info %{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete/post %{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/delete/pre %{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/glustershd -%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/vols -%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/nfs %{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/peers +%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/vols +%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/groups +%{__mkdir_p} %{buildroot}%{_sharedstatedir}/glusterd/nfs/run +touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol +touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid %if 0%{?_with_ufo:1} cd swift-%{SWIFTVER} @@ -737,6 +743,7 @@ fi %{_libdir}/glusterfs/%{version}/xlator/mgmt* %{_libdir}/glusterfs/%{version}/xlator/nfs* %ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/glusterd.info +%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options # This is really ugly, but I have no idea how to mark these directories in an # other way. They should belong to the glusterfs-server package, but don't # exist after installation. They are generated on the first start... @@ -765,8 +772,12 @@ fi %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/glustershd %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/vols -%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/groups +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs +%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/nfs-server.vol +%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/nfs/run +%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/nfs/run/nfs.pid %files devel @@ -1100,6 +1111,11 @@ fi %changelog +* Wed Jan 9 2013 Kaleb S. KEITHLEY - 3.3.1-7 +- additional file ownerships and associated %ghosts from upstream +- add BuildRequires libaio-devel to auto-enable AIO in configure, + overlooked since 3.3.1-1. + * Fri Dec 21 2012 Kaleb S. KEITHLEY - 3.3.1-6 - fix object get, missing iter_hook param in DiskFile::__init__