update fedora 22+ to use 'dnf' instead of 'yum', fix ImageMagick pkgname

This commit is contained in:
Don Bright 2015-06-01 00:07:58 -04:00
parent 7279c1c019
commit 515c77b949

View file

@ -4,7 +4,7 @@
# this assumes you have sudo installed and running, or are running as root.
#
get_fedora_deps()
get_fedora_deps_yum()
{
yum -y install qt5-qtbase-devel bison flex eigen3-devel harfbuzz-devel \
fontconfig-devel freetype-devel \
@ -13,6 +13,15 @@ get_fedora_deps()
xorg-x11-server-Xvfb gettext
}
get_fedora_deps_dnf()
{
dnf -y install qt5-qtbase-devel bison flex eigen3-devel harfbuzz-devel \
fontconfig-devel freetype-devel \
boost-devel mpfr-devel gmp-devel glew-devel CGAL-devel gcc gcc-c++ pkgconfig \
opencsg-devel git libXmu-devel curl ImageMagick glib2-devel make \
xorg-x11-server-Xvfb gettext
}
get_qomo_deps()
{
get_fedora_deps
@ -83,8 +92,14 @@ if [ -e /etc/issue ]; then
get_debian_deps
elif [ "`grep -i suse /etc/issue`" ]; then
get_opensuse_deps
elif [ "`grep -i fedora.release.2[2-9] /etc/issue`" ]; then
get_fedora_deps_dnf
elif [ "`grep -i fedora.release.[3-9][2-9] /etc/issue`" ]; then
get_fedora_deps_dnf
elif [ "`grep -i fedora.release.2[0-1] /etc/issue`" ]; then
get_fedora_deps_yum
elif [ "`grep -i fedora /etc/issue`" ]; then
get_fedora_deps
get_fedora_deps_yum
elif [ "`grep -i red.hat /etc/issue`" ]; then
get_fedora_deps
elif [ "`grep -i mageia /etc/issue`" ]; then