Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix packaging for Fedora
In Fedora, qmake is qmake-qt5 and INSTALL_ROOT is not added automatically. In addition,
a test that is mainly focussed on ICU is disabled as it would require extra package in
Fedora.

Signed-off-by: Rinigus <rinigus.git@gmail.com>
  • Loading branch information
rinigus committed Sep 10, 2020
1 parent 3b0686a commit 9ec7a1c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
7 changes: 6 additions & 1 deletion configure
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion rpm/libmlocale-qt5.spec
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion tests/tests.pro
Expand Up @@ -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 \
Expand Down

0 comments on commit 9ec7a1c

Please sign in to comment.