try harder, use QMap instead of QHash to workaround multilib conflicts (#1262746)

kf5-sonnet.spec

@@ -2,7 +2,7 @@
 
 Name:           kf5-%{framework}
 Version:        5.13.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        KDE Frameworks 5 Tier 1 solution for spell checking
 
 License:        LGPLv2+
@@ -21,8 +21,10 @@ Source0:        http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra
 # adjust hard-coded mysql dict paths to what fedora uses
 Patch1: sonnet-5.10.0-myspell_path.patch
 
-BuildRequires:  libupnp-devel
-BuildRequires:  systemd-devel
+# workaround multilib conflicts in trigrams.map by using QMap instead of QHash
+# https://bugzilla.redhat.com/show_bug.cgi?id=1262746
+Patch2: sonnet-5.13.0-multilib.patch
+
 BuildRequires:  hunspell-devel
 BuildRequires:  zlib-devel
 
@@ -67,13 +69,10 @@ GUI part of the Sonnet framework provides widgets with spell checking support.
 %setup -q -n %{framework}-%{version}
 
 %patch1 -p1 -b .myspell_path
+%patch2 -p1 -b .multilib
 
 
 %build
-# HACK to avoid multilib conflicts in /usr/share/kf5/sonnet/trigrams.map
-# https://bugzilla.redhat.com/show_bug.cgi?id=1262746
-QT_HASH_SEED=0; export QT_HASH_SEED
-
 mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kf5} ..
@@ -119,6 +118,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
 
 %changelog
+* Tue Sep 15 2015 Rex Dieter <rdieter@fedoraproject.org> 5.13.0-3
+- try harder, use QMap instead of QHash to workaround multilib conflicts (#1262746)
+
 * Mon Sep 14 2015 Rex Dieter <rdieter@fedoraproject.org> 5.13.0-2
 - QT_HASH_SEED=0, to workaround multilib conflicts (#1262746)