fix "warning: File listed twice: .../glusterd.info" while building

In upstream/master: http://review.gluster.org/5836
In upstream/release-3.4: http://review.gluster.org/6149
This commit is contained in:
Niels de Vos 2013-10-27 13:54:15 +01:00
parent ba4470a022
commit a9739ec316

View File

@ -630,8 +630,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
@ -765,8 +764,9 @@ if [ $1 -ge 1 ]; then
fi
%changelog
* Sun Oct 27 2013 Niels de Vos <ndevos@redhat.com>
* Sun Oct 27 2013 Niels de Vos <ndevos@redhat.com> - 3.4.1-3
- Correctly start+stop glusterfsd.service (#1022542)
- fix "warning: File listed twice: .../glusterd.info" while building
* Sat Oct 26 2013 Niels de Vos <ndevos@redhat.com>
- add base-port config option to /etc/glusterd/glusterd.vol (#1023653)