osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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 <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Dario Lombardo 2019-05-19 16:41:03 +02:00 committed by Anders Broman
parent 4a5117ca43
commit 1a7b83c20f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/rpm-setup.sh
View File

@ -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