From 9ec7a1cb73bcde19fb6908296ebbdab3cf6cbc00 Mon Sep 17 00:00:00 2001
From: Rinigus <rinigus.git@gmail.com>
Date: Thu, 10 Sep 2020 18:41:54 +0300
Subject: [PATCH] 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>
---
 configure               | 7 ++++++-
 rpm/libmlocale-qt5.spec | 2 +-
 tests/tests.pro         | 4 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index aa5688438..4ebf56c63 100755
--- a/configure
+++ b/configure
@@ -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"
diff --git a/rpm/libmlocale-qt5.spec b/rpm/libmlocale-qt5.spec
index 2004d4746..d54c88735 100644
--- a/rpm/libmlocale-qt5.spec
+++ b/rpm/libmlocale-qt5.spec
@@ -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
 
diff --git a/tests/tests.pro b/tests/tests.pro
index af894ebce..8cd3e1480 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -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 \