From: Kefu Chai <kchai@redhat.com>
Date: Thu, 10 Oct 2019 02:40:53 +0000 (+0800)
Subject: install-deps.sh: install python3-devel for python related rpm macros
X-Git-Tag: v15.1.0~1258^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7a93cb2ba0e2e7bc5bfaca607764907250ca8178;p=ceph.git

install-deps.sh: install python3-devel for python related rpm macros

python3-devel depends on python-rpm-macros, which in turn depends on
python-srpm-macros. the latter offers `python3_pkgversion` macro, which
is necessary for prepare the build dependencies of rpm packages.

this change avoids the unnecessary `$yumdnf` calls, and to simplify the
code.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/install-deps.sh b/install-deps.sh
index 53a536ca77ba..7c4732efc306 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -372,7 +372,6 @@ else
                 $SUDO rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$MAJOR_VERSION
                 $SUDO rm -f /etc/yum.repos.d/dl.fedoraproject.org*
                 if test $ID = centos -a $MAJOR_VERSION = 7 ; then
-		    $SUDO $yumdnf install -y python36-devel
 		    case "$ARCH" in
 			x86_64)
 			    $SUDO yum -y install centos-release-scl
@@ -398,8 +397,8 @@ else
                 ;;
         esac
         munge_ceph_spec_in $with_seastar $for_make_check $DIR/ceph.spec
-        # for python3_pkgversion
-        $SUDO $yumdnf install -y python-srpm-macros
+        # for python3_pkgversion macro defined by python-srpm-macros, which is required by python3-devel
+        $SUDO $yumdnf install -y python3-devel
         $SUDO $builddepcmd $DIR/ceph.spec 2>&1 | tee $DIR/yum-builddep.out
         [ ${PIPESTATUS[0]} -ne 0 ] && exit 1
 	if [ -n "$dts_ver" ]; then