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