Updated RPM spec file and debian dependencies.

This commit is contained in:
Matthias Koefferlein 2017-09-16 19:44:01 +02:00
parent 0f0bea44c3
commit 89a7afcb13
2 changed files with 10 additions and 4 deletions

View File

@ -19,7 +19,7 @@ fi
# TODO: derive this list automatically?
case $target in
ubuntu16)
depends="libqt4-designer (>= 4.8.6), libqt4-xml (>= 4.8.6), libqt4-sql (>= 4.8.6), libqt4-network (>= 4.8.6), libqtcore4 (>= 4.8.6), libqtgui4 (>= 4.8.6), zlib1g (>= 1.2.8), libruby2.3 (>= 2.3.1), libpython3 (>= 3.5.1)"
depends="libqt4-designer (>= 4.8.6), libqt4-xml (>= 4.8.6), libqt4-sql (>= 4.8.6), libqt4-network (>= 4.8.6), libqtcore4 (>= 4.8.6), libqtgui4 (>= 4.8.6), zlib1g (>= 1.2.8), libruby2.3 (>= 2.3.1), libpython3 (>= 3.5.1), libstdc++6 (>= 4.6.3), libc6 (>= 2.15)"
;;
*)
echo "Unknown target '$target' (given as first argument)"

View File

@ -45,14 +45,14 @@ Requires: qt-x11 >= 4.8.5
%if "%{target_system}" == "opensuse42_2"
# OpenSuSE 42.2 requirements
Requires: ruby >= 2.1.0
Requires: ruby2.3 >= 2.3.1
Requires: python >= 3.4.6
Requires: libqt4 >= 4.8.6
%endif
%if "%{target_system}" == "opensuse42_3"
# OpenSuSE 42.3 requirements
Requires: ruby >= 2.1.0
Requires: ruby2.3 >= 2.3.1
Requires: python >= 3.4.6
Requires: libqt4 >= 4.8.6
# ...
@ -95,7 +95,13 @@ elif which python; then
fi
RUBY=ruby
if which ruby2; then
if which ruby2.3; then
RUBY=ruby2.3
elif which ruby2.2; then
RUBY=ruby2.2
elif which ruby2.1; then
RUBY=ruby2.1
elif which ruby2; then
RUBY=ruby2
elif which ruby; then
RUBY=ruby