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.
This commit is contained in:
parent
baaf60cb34
commit
6e6386a3dc
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue