Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY 2018-11-14 13:22:40 -05:00
parent fad240f71e
commit 229c739e5b
3 changed files with 12 additions and 45 deletions

View File

@ -1,42 +0,0 @@
--- 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

View File

@ -23,6 +23,10 @@
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd
%{?_without_bd:%global _without_bd --disable-bd-xlator}
%if ( 0%{?rhel} && 0%{?rhel} > 7 )
%global _without_bd --without-bd
%endif
# cmocka
# if you wish to compile an rpm with cmocka unit testing...
# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with cmocka
@ -210,7 +214,7 @@
Summary: Distributed File System
%if ( 0%{_for_fedora_koji_builds} )
Name: glusterfs
Version: 5.0
Version: 5.1
Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: @PACKAGE_NAME@
@ -254,7 +258,7 @@ BuildRequires: python-ctypes
%if ( ( 0%{?_with_ipv6default:1} ) || ( 0%{!?_without_libtirpc:1} ) )
BuildRequires: libtirpc-devel
%endif
%if ( 0%{?fedora} && 0%{?fedora} > 27 )
%if ( 0%{?fedora} && 0%{?fedora} > 27 ) || ( 0%{?rhel} && 0%{?rhel} > 7 )
BuildRequires: rpcgen
%endif
BuildRequires: userspace-rcu-devel >= 0.7
@ -1323,7 +1327,9 @@ exit 0
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server.so
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage
%if ( 0%{!?_without_bd:1} )
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/bd.so
%endif
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/posix.so
%dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance
%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so
@ -1439,6 +1445,9 @@ exit 0
%endif
%changelog
* Wed Nov 14 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.1-1
- 5.1 GA
* Thu Oct 18 2018 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 5.0-1
- 5.0 GA

View File

@ -1 +1 @@
SHA512 (glusterfs-5.0.tar.gz) = 45ccd3f3bbc9653998850f618f9776642da4a16508c056febc19c9db6aef2d1c58232f398e29ce034de45960b62d3e5bd54614aaf7030ba7e6025ff23968d475
SHA512 (glusterfs-5.1.tar.gz) = db5649166c960c894162b2f2e706d85accff663fff71e80ed5a9f24a3863d2a0e0d94bc42d39baf1002f1ec8ef5445ff791d6d3edd539bfc8d6f6d00d7897db2