4.1.2, gsyncd.conf /usr/local/sbin

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch

@@ -0,0 +1,38 @@
+From a0a0afc59bb1d2deddfdb776bc9e49e02f58ce32 Mon Sep 17 00:00:00 2001
+From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
+Date: Tue, 24 Jul 2018 14:40:51 -0400
+Subject: [PATCH] georep: fix hard-coded paths in gsyncd.conf.in
+
+Why anyone puts a hard-coded path like /usr/local/sbin in a
+config file is beyond me.
+
+I wonder how many more are lurking in our sources
+
+Change-Id: I6523894416cc06236ea1f99529efd36e957bd98e
+updates: bz#1193929
+Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
+---
+ geo-replication/gsyncd.conf.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/geo-replication/gsyncd.conf.in b/geo-replication/gsyncd.conf.in
+index 0a842cf2b..bd04400ff 100644
+--- a/geo-replication/gsyncd.conf.in
++++ b/geo-replication/gsyncd.conf.in
+@@ -138,11 +138,11 @@ value =
+ help=If SSH keys are not secured with gsyncd prefix then use this configuration to set the actual path of gsyncd(Usually /usr/libexec/glusterfs/gsyncd)
+ 
+ [gluster-command-dir]
+-value=/usr/local/sbin/
++value=@SBIN_DIR@
+ help=Directory where Gluster binaries exist on master
+ 
+ [slave-gluster-command-dir]
+-value=/usr/local/sbin/
++value=@SBIN_DIR@
+ help=Directory where Gluster binaries exist on slave
+ 
+ [gluster-params]
+-- 
+2.17.1
+

glusterfs.spec

@@ -217,7 +217,7 @@ Summary:          Distributed File System
 %if ( 0%{_for_fedora_koji_builds} )
 Name:             glusterfs
 Version:          4.1.2
-Release:          %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}.1
+Release:          %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist}.1
 %else
 Name:             @PACKAGE_NAME@
 Version:          @PACKAGE_VERSION@
@@ -228,6 +228,7 @@ URL:              http://docs.gluster.org/
 %if ( 0%{_for_fedora_koji_builds} )
 Source0:          http://download.gluster.org/pub/gluster/%{name}/4.1/%{version}%{?prereltag}/%{name}-%{version}%{?prereltag}.tar.gz
 Patch0:           python.patch
+Patch1:           0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch
 Source1:          glusterd.sysconfig
 Source2:          glusterfsd.sysconfig
 Source6:          rhel5-load-fuse-modules
@@ -689,6 +690,7 @@ This package provides the glusterfs server daemon.
 %prep
 %setup -q -n %{name}-%{version}%{?prereltag}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %if ( 0%{?rhel} && 0%{?rhel} < 6 )
@@ -1440,6 +1442,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Jul 24 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.2-2
+- 4.1.2, gsyncd.conf /usr/local/sbin 
+
 * Tue Jul 24 2018  Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 4.1.2-1
 - 4.1.2 GA