From 1e3c9243a88c07b0710dbbb92e45abfbe5aec46e Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Thu, 23 Mar 2023 09:56:17 +0000 Subject: [PATCH] Fix the test so it works for RHEL<9 as well Before RHEL-9 the minizip-compat-devel package was named minizip-devel Also since F38 the minizip package was renamed to minizip-ng so we cannot check for the minizip-devel package using the 'rpm -q' because it will always fail and not remove the package --- .../runtest.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) 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"