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

Niels de Vos devos at fedoraproject.org
Fri Sep 6 11:22:06 UTC 2013


commit 7cd60ea17a707b0e627ac1ad1b8fce24819ce51d
Author: Niels de Vos <devos at fedoraproject.org>
Date:   Fri Sep 6 12:43:19 2013 +0200

    fix "warning: File listed twice: .../glusterd.info" while building
    
    Resolves upstream Bug 1005161.

 glusterfs.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/glusterfs.spec b/glusterfs.spec
index 28826a8..14ea0bf 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -1031,8 +1031,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
@@ -1497,6 +1496,9 @@ fi
 %endif
 
 %changelog
+* Fri Sep 6 2013 Niels de Vos <devos at fedoraproject.org>
+- fix "warning: File listed twice: .../glusterd.info" while building
+
 * Tue Aug 6 2013 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 3.4.0-8
 - glusterfs-server requires glusterfs-cli
 


More information about the scm-commits mailing list