summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S KEITHLEY <kkeithle@redhat.com>2016-05-06 12:07:41 -0400
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-05-09 10:31:36 -0700
commit731d15a018f3c2451f72c84f4e07aa23c8abc8d2 (patch)
tree4cd3b71e58be6c899e16c1eaae7764b42a215de0
parentf0ade919006b2581ae192f997a8ae5bacc2892af (diff)
packaging: additional dirs and files in /var/lib/glusterd/
Directory /var/lib/glusterd/glusterfind/.keys doesn't need to be created, it just needs to be listed in the list of files. Also, S57glusterfind-delete-post.py under the hooks directory is actually a symlink to libexec/glusterfs/glusterfind/... so don't list %attr(...) for the symlink Change-Id: Ia4571a7b5d0cc79c70cc120f7770bf2e6453bc84 BUG: 1326410 Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/14243 NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Aravinda VK <avishwan@redhat.com> Smoke: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
-rw-r--r--glusterfs.spec.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index e0d1da143d4..49ad5ce1b08 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -710,8 +710,6 @@ find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glus
install -p -m 0744 -D extras/command-completion/gluster.bash \
%{buildroot}%{_sysconfdir}/bash_completion.d/gluster
-mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/glusterfind/.keys
-
%clean
rm -rf %{buildroot}
@@ -1129,7 +1127,7 @@ exit 0
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/copy-file/pre
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete
%dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post
- %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py
+ %{_sharedstatedir}/glusterd/hooks/1/delete/post/S57glusterfind-delete-post.py
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/delete/pre
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick
%ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/remove-brick/post
@@ -1180,6 +1178,9 @@ exit 0
%{_sbindir}/gf_recon
%changelog
+* Fri May 6 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com>
+- additional dirs and files in /var/lib/glusterd/... (#1326410)
+
* Tue Apr 26 2016 Kaleb S. KEITHLEY <kkeithle@redhat.com>
- %%postun libs w/o firewalld on RHEL6 (#1330583)