From: Thomas Serlin <tserlin@redhat.com>
Date: Fri, 19 Jun 2020 23:19:54 +0000 (-0400)
Subject: nfs-ganesha: enable PowerTools repo for CentOS 8; remove sed hack
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1595%2Fhead;p=ceph-build.git

nfs-ganesha: enable PowerTools repo for CentOS 8; remove sed hack

The CentOS 8 PowerTools repo is disabled by default, but we need
it for a few *-devel packages.

Also, the sed hack for adding the libacl-devel package is no longer
needed. The change was merged upstream:

https://github.com/nfs-ganesha/nfs-ganesha/commit/8f01a5df9dbcdad6c501efb929a711c3ba6a6b4c
---

diff --git a/nfs-ganesha/build/build_rpm b/nfs-ganesha/build/build_rpm
index 3dbcec04..a0e43500 100644
--- a/nfs-ganesha/build/build_rpm
+++ b/nfs-ganesha/build/build_rpm
@@ -15,6 +15,12 @@ then
 	sudo yum-config-manager --disable google-chrome
 fi
 
+# Some  -devel packages are only available in the CentOS 8 PowerTools repo. Enable it:
+if [ $DIST = centos8 ]
+then
+	sudo yum-config-manager --enable PowerTools
+fi
+
 # Clean up Jenkins slave before each build
 sudo rm -rf /var/cache/yum/*
 sudo yum -y clean all
@@ -119,9 +125,6 @@ sed -i 's/libcephfs1-devel/libcephfs-devel/' $WORKSPACE/nfs-ganesha/src/nfs-gane
 sed -i 's/librgw2-devel/librgw-devel/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec
 sed -i 's/CMAKE_BUILD_TYPE=Debug/CMAKE_BUILD_TYPE=RelWithDebInfo/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec
 
-# libacl-devel needs to be a CephFS BuildRequires in the upstream nfs-ganesha.spec-in.cmake
-sed -i 's/krb5-devel/krb5-devel libacl-devel/' $WORKSPACE/nfs-ganesha/src/nfs-ganesha.spec
-
 ## Create the source rpm
 echo "Building SRPM"
 rpmbuild \