aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss.ws@gmail.com>2016-02-11 21:46:33 -0500
committerJeff Morriss <jeff.morriss.ws@gmail.com>2016-02-23 22:24:41 +0000
commit62903874f359db596eaf170a6a4c3e662c589974 (patch)
tree35dd95d4048267e3f5b05f2915196916ea934650 /tools
parentfa20bbb677e7adfdf2761025fc16c5abff077ed4 (diff)
When installing RPMs for development, use dnf if the OS has it.
Also install the Qt5-devel packages (in addition to plain old "Qt"). Change-Id: I86f6a779dc9d0b359c69f0627106d1cce3120f83 Reviewed-on: https://code.wireshark.org/review/13916 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/install_rpms_for_devel.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/install_rpms_for_devel.sh b/tools/install_rpms_for_devel.sh
index 6969009055..a806d07237 100755
--- a/tools/install_rpms_for_devel.sh
+++ b/tools/install_rpms_for_devel.sh
@@ -45,10 +45,15 @@ else
echo
fi
- INSTALL_CMD=yum
+ if type -p dnf > /dev/null
+ then
+ INSTALL_CMD=dnf
+ else
+ INSTALL_CMD=yum
+ fi
GTK2="gtk2-devel gtk2"
GTK3="gtk3-devel gtk3"
- QT="qt-devel gcc-c++"
+ QT="qt-devel gcc-c++ qt5-qtbase-devel qt5-qtmultimedia-devel"
GLIB2="glib2-devel glib2"
PCAP="libpcap-devel libpcap"
ZLIB="zlib-devel zlib"