Commit 5de5b558 authored by pvuorela's avatar pvuorela

Merge branch 'packaging' into 'master'

Fix packaging for Fedora

See merge request !11
parents 3b0686ab 9ec7a1cb
......@@ -536,7 +536,12 @@ if [ -z "$QTDIR" ]; then
if [ $? -eq 0 ]; then
QMAKE_BIN=`which qmake`
else
echo "qmake was not found in your path\n"
which qmake-qt5 > /dev/null
if [ $? -eq 0 ]; then
QMAKE_BIN=`which qmake-qt5`
else
echo "qmake was not found in your path\n"
fi
fi
elif [ -f "$QTDIR/bin/qmake" ]; then
QMAKE_BIN="$QTDIR/bin/qmake"
......
......@@ -57,7 +57,7 @@ make %{?_smp_mflags}
%install
rm -rf %{buildroot}
export QT_SELECT=5
%make_install
%make_install INSTALL_ROOT=%{buildroot}
%post -p /sbin/ldconfig
......
......@@ -18,7 +18,9 @@ contains(DEFINES, HAVE_ICU) {
SUBDIRS += \
ft_breakiterator \
ft_locales \
ft_localedata \
\ ## commented out as genrb is packaged separately in Fedora
\ ## and this test is mainly focussed on ICU, but not mlocale
\ # ft_localedata \
ft_mlocalebuckets \
ft_numbers \
ft_sorting \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment