From 6e6386a3dce1edb850328a8627e1cd02db0a6474 Mon Sep 17 00:00:00 2001 From: John Thacker Date: Wed, 16 Nov 2022 18:44:01 -0500 Subject: [PATCH] rpm-setup: Don't attempt to install cmake3 cmake is already in the basic list of packages. "cmake3" is necessary for RHEL/CentOS 7 (where the "cmake" package is 2.8.12), but that distribution isn't supported on 4.0 and later. At the same time, the OpenSUSE 15.4 repository accidentally has a "cmake3" package which is an earlier version than the "cmake" RPM, which creates some conflicts when trying to install both. (https://gitlab.com/wireshark/wireshark-containers/-/jobs/3328997023) So, don't attempt to install cmake3 anymore. --- tools/rpm-setup.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/rpm-setup.sh b/tools/rpm-setup.sh index db063117a5..076e472244 100755 --- a/tools/rpm-setup.sh +++ b/tools/rpm-setup.sh @@ -159,9 +159,6 @@ add_packages() { eval "${list}=\"\${${list}} \${pkgnames}\"" } -add_package BASIC_LIST cmake3 || add_package BASIC_LIST cmake || -echo "Required package cmake|cmake3 is unavailable" >&2 - add_package BASIC_LIST glib2 || add_package BASIC_LIST libglib-2_0-0 || echo "Required package glib2|libglib-2_0-0 is unavailable" >&2