From 1a7b83c20f9aaada057adf523ae2ad5a35bf58a3 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Sun, 19 May 2019 16:41:03 +0200 Subject: [PATCH] tools: fix rpm-setup script. Some packages are missing, others are in the wrong place. Change-Id: I396716e85e2106f527b7ff7ad5ee7a519061cbdd Reviewed-on: https://code.wireshark.org/review/33264 Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman --- tools/rpm-setup.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/rpm-setup.sh b/tools/rpm-setup.sh index 75b9a766a0..3be0062774 100755 --- a/tools/rpm-setup.sh +++ b/tools/rpm-setup.sh @@ -38,20 +38,19 @@ do fi done -BASIC_LIST="gcc \ +BASIC_LIST="cmake \ + gcc \ gcc-c++ \ flex \ bison \ perl \ desktop-file-utils \ git \ - git-review \ glib2-devel \ libpcap-devel \ zlib-devel" ADDITIONAL_LIST="libnl3-devel \ - libnghttp2-devel \ libcap-devel \ libgcrypt-devel \ libssh-devel \ @@ -178,7 +177,7 @@ echo "perl-podlators unavailable" >&2 add_package ADDITIONAL_LIST libcap || add_package ADDITIONAL_LIST libcap2 || echo "libcap is unavailable" >&2 -add_package ADDITIONAL_LIST nghttp2 || add_package ADDITIONAL_LIST libnghttp2 || +add_package ADDITIONAL_LIST nghttp2-devel || add_package ADDITIONAL_LIST libnghttp2-devel || echo "nghttp2 is unavailable" >&2 add_package ADDITIONAL_LIST snappy || add_package ADDITIONAL_LIST libsnappy1 || @@ -213,6 +212,9 @@ echo "xslt is unavailable" >&2 add_package ADDITIONAL_LIST brotli-devel || add_packages ADDITIONAL_LIST libbrotli-devel libbrotlidec1 || echo "brotli is unavailable" >&2 +add_package ADDITIONAL_LIST git-review || +echo "git-review is unavailabe" >&2 + ACTUAL_LIST=$BASIC_LIST # Now arrange for optional support libraries