summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2013-09-06 12:08:19 +0200
committerAnand Avati <avati@redhat.com>2013-09-08 09:49:31 -0700
commitd3e533fe333449a782b925414d856469987ee00a (patch)
treed2a679b5aa45204d0bb781aa356313a52dc3884e
parent2347a1a7594dafc1e6a74784287efe84963fe4ea (diff)
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. Change-Id: I0d518ec186a8725dc4c5cba00b60da83fdadf103 BUG: 1005161 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/5836 Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
-rw-r--r--glusterfs.spec.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index f474187..a64e2ba 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -686,8 +686,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