diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2019-09-23 01:06:57 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2019-09-23 08:50:10 +0000 |
| commit | ceb2ee2e444099c69f00ad2bd234ab8b78bda2de (patch) | |
| tree | 19f50cf23b066888f894db141058f64d1c73db66 /tools/rpm-setup.sh | |
| parent | e52f33f66c979ac493fa738005815bb01d5304a8 (diff) | |
rpm: use python3 to fix CentOS 7 builds
CentOS 7 (1908) started including python3 (Python 3.6), see
https://wiki.centos.org/Manuals/ReleaseNotes/CentOS7.1908
Change-Id: I6418e7839f1119cf1152f445759e92acd4f39cc4
Reviewed-on: https://code.wireshark.org/review/34593
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'tools/rpm-setup.sh')
| -rwxr-xr-x | tools/rpm-setup.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/rpm-setup.sh b/tools/rpm-setup.sh index a988e402f1..09a98b3213 100755 --- a/tools/rpm-setup.sh +++ b/tools/rpm-setup.sh @@ -43,6 +43,7 @@ BASIC_LIST="cmake \ gcc-c++ \ flex \ bison \ + python3 \ perl \ desktop-file-utils \ git \ @@ -118,11 +119,6 @@ add_packages() { eval "${list}=\"\${${list}} \${pkgnames}\"" } -# python3: OpenSUSE 43.3, Fedora 26 -# python34: Centos 7 -add_package BASIC_LIST python3 || add_package BASIC_LIST python34 || -echo "python3 is unavailable" >&2 - add_package BASIC_LIST cmake3 || add_package BASIC_LIST cmake || echo "cmake is unavailable" >&2 |