diff --git a/0001-configure.ac.patch b/0001-configure.ac.patch new file mode 100644 index 0000000..55733ad --- /dev/null +++ b/0001-configure.ac.patch @@ -0,0 +1,42 @@ +--- glusterfs-5.0rc0/configure.ac.orig 2018-09-24 12:44:51.547254900 -0400 ++++ glusterfs-5.0rc0/configure.ac 2018-09-24 12:55:49.464254900 -0400 +@@ -629,12 +629,14 @@ + *) + if test -x /usr/bin/python3; then + PYTHON=/usr/bin/python3 +- else ++ fi ++ if test -x /usr/bin/python2; then + PYTHON=/usr/bin/python2 + fi + ;; + esac + fi ++ + AM_PATH_PYTHON([2.6],,[:]) + if test -n "${PYTHON}"; then + have_python=yes +@@ -1688,13 +1690,16 @@ + + pushd $(dirname $0) &> /dev/null + if test ! -e python-shebangs; then +- touch python-shebangs +- if test "x${PYTHON}" = "x/usr/bin/python2"; then +- echo "fixing python shebangs..." +- for f in api events extras geo-replication libglusterfs tests tools xlators; do +- find $f -type f -exec sed -i 's|/usr/bin/python3|/usr/bin/python2|' {} \; +- done +- echo "...done" ++ dnl koji's mock buildSRPMFromSCM subtask run's configure, with ++ if test -n "${PYTHON}"; then ++ touch python-shebangs ++ if test "x${PYTHON}" = "x/usr/bin/python2"; then ++ echo "fixing python shebangs..." ++ for f in api events extras geo-replication libglusterfs tests tools xlators; do ++ find $f -type f -exec sed -i 's|/usr/bin/python3|/usr/bin/python2|' {} \; ++ done ++ echo "...done" ++ fi + fi + fi + popd &> /dev/null 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.spec b/glusterfs.spec index 947cc05..0321b74 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -231,7 +231,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 5.0 -Release: %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist} +Release: %{?prereltag:0.}3%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -707,6 +707,13 @@ This package provides the glusterfs server daemon. %prep %setup -q -n %{name}-%{version}%{?prereltag} +# jenkins release(-new) job (running on CentOS 7) did `./autogen.sh; +# ./configure; make dist`, and the python shebangs were borked. +# this is a temporary work-around +echo "unborking python shebangs..." +for f in api events extras geo-replication libglusterfs tests tools xlators; do +find $f -type f -exec sed -i 's|/usr/bin/python2|/usr/bin/python3|' {} \; +done %build %if ( 0%{?rhel} && 0%{?rhel} < 6 ) @@ -1485,6 +1492,9 @@ exit 0 %endif %changelog +* Mon Sep 24 2018 Kaleb S. KEITHLEY - 5.0rc0-0.3 +- 5.0 RC0, unbork python shebangs + * Thu Sep 20 2018 Kaleb S. KEITHLEY - 5.0rc0-0.2 - 5.0 RC0