From 0cf5e7eb1316d20fcc60a3e11d8ddaafeff862eb Mon Sep 17 00:00:00 2001
From: Milind Changire <mchangir@redhat.com>
Date: Tue, 4 Jul 2017 17:10:27 +0530
Subject: [PATCH 541/557] build: make gf_attach available in glusterfs-server
Problem:
gf_attach was erroneously packaged in glusterfs-fuse
Solution:
move gf_attach listing to server package
add gf_attach to the exclude listing for client builds
Label: DOWNSTREAM ONLY
Change-Id: I0de45700badcbab65febf2385f1ac074c44cfa7c
BUG: 1467621
Signed-off-by: Milind Changire <mchangir@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/111001
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
glusterfs.spec.in | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/glusterfs.spec.in b/glusterfs.spec.in
index 00c0e08..b1feedc 100644
--- a/glusterfs.spec.in
+++ b/glusterfs.spec.in
@@ -1114,6 +1114,7 @@ exit 0
%exclude %{_sbindir}/gcron.py
%exclude %{_sbindir}/glfsheal
%exclude %{_sbindir}/glusterd
+%exclude %{_sbindir}/gf_attach
%exclude %{_sbindir}/snap_scheduler.py
%exclude %{_datadir}/glusterfs/scripts/stop-all-gluster-processes.sh
%if ( 0%{?_with_systemd:1} )
@@ -1253,7 +1254,6 @@ exit 0
# glusterfs is a symlink to glusterfsd, -server depends on -fuse.
%{_sbindir}/glusterfs
%{_sbindir}/glusterfsd
-%{_sbindir}/gf_attach
%config(noreplace) %{_sysconfdir}/logrotate.d/glusterfs
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/mount/fuse.so
/sbin/mount.glusterfs
@@ -1367,6 +1367,7 @@ exit 0
# binaries
%{_sbindir}/glusterd
%{_sbindir}/glfsheal
+%{_sbindir}/gf_attach
# {_sbindir}/glusterfsd is the actual binary, but glusterfs (client) is a
# symlink. The binary itself (and symlink) are part of the glusterfs-fuse
# package, because glusterfs-server depends on that anyway.
@@ -2101,6 +2102,9 @@ end
%endif
%changelog
+* Tue Jul 04 2017 Milind Changire <mchangir@redhat.com>
+- moved %{_sbindir}/gf_attach from glusterfs-fuse to glusterfs-server
+
* Fri Jun 23 2017 Kaleb S. KEITHLEY <kkeithle@redhat.com>
- DOWNSTREAM ONLY remove Requires: selinux-policy for puddle generation
--
1.8.3.1