From 65dd4dd4f553d9e2b7c2d19d66ce2f36a4ee7de9 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Sun, 27 Oct 2013 14:02:38 +0100 Subject: rpm: fix "warning: File listed twice: .../glusterd.info" Commit a482e422 added glusterd.info to the %files section of the glusterfs-server package. However, this file was listed already. This causes the following warning when building the RPMs: warning: File listed twice: /var/lib/glusterd/glusterd.info Merging the attributes for /var/lib/glusterd/glusterd.info into one line prevents this warning. This have been merged in the master branch: > Change-Id: I0d518ec186a8725dc4c5cba00b60da83fdadf103 > Reviewed-on: http://review.gluster.org/5836 > Reviewed-by: Kaleb KEITHLEY > Tested-by: Gluster Build System > Reviewed-by: Anand Avati BUG: 1005161 Change-Id: I98633415675817a6170707ca9170bb59b77d1c24 Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/6149 Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY --- glusterfs.spec.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 8253b88ac6b..741025c4281 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -628,8 +628,7 @@ fi %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mgmt* %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/nfs* -%config(noreplace) %{_sharedstatedir}/glusterd/glusterd.info -%ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/glusterd.info +%ghost %attr(0644,-,-) %config(noreplace) %{_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 -- cgit