diff --git a/Regression/bz690835-Please-enable-minizip-in-zlib-spec-file/runtest.sh b/Regression/bz690835-Please-enable-minizip-in-zlib-spec-file/runtest.sh index ad1646a..5e98915 100755 --- a/Regression/bz690835-Please-enable-minizip-in-zlib-spec-file/runtest.sh +++ b/Regression/bz690835-Please-enable-minizip-in-zlib-spec-file/runtest.sh @@ -30,13 +30,21 @@ . /usr/share/beakerlib/beakerlib.sh PACKAGE="zlib" +MINIZIP_PACKAGE="minizip-compat-devel" +if rlIsRHEL '<9'; then + MINIZIP_PACKAGE="minizip-devel" +fi rlJournalStart rlPhaseStartSetup - rlRun "rpm -q minizip-devel && yum remove minizip-devel -y" 0,1 - rlRun "rpm -q minizip-compat-devel || yum install minizip-compat-devel -y" - rlAssertRpm $PACKAGE - rlAssertRpm minizip-compat-devel + # Since RHEL-9 the minizip-devel was replaced by minizip-compat-devel + # so we need to remove it before installing the compat package + # they conflict with each other + if ! rlIsRHEL '<9' ; then + rlRun "yum remove minizip-devel -y" 0,1 + rlRun "rpm -q $MINIZIP_PACKAGE || yum install $MINIZIP_PACKAGE -y" + fi + rlAssertRpm $MINIZIP_PACKAGE rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "tar -C $TmpDir -xzf minizip.tar.gz" rlRun "pushd $TmpDir"