diff --git a/0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch b/0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch deleted file mode 100644 index c2229f1..0000000 --- a/0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a0a0afc59bb1d2deddfdb776bc9e49e02f58ce32 Mon Sep 17 00:00:00 2001 -From: "Kaleb S. KEITHLEY" -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 ---- - 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 - diff --git a/glusterfs-4.1.5.tar.gz b/glusterfs-4.1.5.tar.gz deleted file mode 100644 index d524c96..0000000 Binary files a/glusterfs-4.1.5.tar.gz and /dev/null differ diff --git a/glusterfs.spec b/glusterfs.spec index 00b94a7..49d274f 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -457,7 +457,7 @@ exit 0 %{_mandir}/man8/*gluster*.8* %changelog -* Sat Jan 21 2019 renxudong - 7.0-1 +* Sat Jan 21 2020 renxudong - 7.0-1 - Type:Upgrade - ID:NA - SUG:NA diff --git a/load-fuse-modules b/load-fuse-modules deleted file mode 100644 index ee194db..0000000 --- a/load-fuse-modules +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# -# fusermount-glusterfs requires the /dev/fuse character device. The fuse module -# provides this and is loaded on demand in newer Linux distributions. -# - -[ -c /dev/fuse ] || /sbin/modprobe fuse diff --git a/python.patch b/python.patch deleted file mode 100644 index b8d8730..0000000 --- a/python.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- glusterfs-4.1.1/xlators/features/utime/src/utime-gen-fops-c.py.orig 2018-07-11 09:40:35.166390285 -0400 -+++ glusterfs-4.1.1/xlators/features/utime/src/utime-gen-fops-c.py 2018-07-11 09:41:00.743390285 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - import os - import sys ---- glusterfs-4.1.1/xlators/features/utime/src/utime-gen-fops-h.py.orig 2018-07-11 09:40:49.035390285 -0400 -+++ glusterfs-4.1.1/xlators/features/utime/src/utime-gen-fops-h.py 2018-07-11 09:41:06.015390285 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - import os - import sys ---- glusterfs-4.1.1/xlators/features/cloudsync/src/cloudsync-fops-c.py.orig 2018-07-11 09:41:30.646390285 -0400 -+++ glusterfs-4.1.1/xlators/features/cloudsync/src/cloudsync-fops-c.py 2018-07-11 09:41:53.033390285 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - from __future__ import print_function - import os ---- glusterfs-4.1.1/xlators/features/cloudsync/src/cloudsync-fops-h.py.orig 2018-07-11 09:41:38.198390285 -0400 -+++ glusterfs-4.1.1/xlators/features/cloudsync/src/cloudsync-fops-h.py 2018-07-11 09:41:55.423390285 -0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python2 - - from __future__ import print_function - import os