work harder to avoid multilib conflicts (kde#403630, #1669800)

kf5-sonnet.spec

@@ -9,7 +9,7 @@
 
 Name:    kf5-%{framework}
 Version: 5.54.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE Frameworks 5 Tier 1 solution for spell checking
 
 License: LGPLv2+
@@ -27,11 +27,6 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{v
 # filter plugin provides
 %global __provides_exclude_from ^(%{_kf5_plugindir}/.*\\.so)$
 
-## upstreamable patches
-# workaround multilib conflicts in trigrams.map by using QMap instead of QHash
-# https://bugzilla.redhat.com/show_bug.cgi?id=1262746
-Patch102: sonnet-multilib.patch
-
 BuildRequires:  extra-cmake-modules >= %{majmin}
 %if ! 0%{?bootstrap}
 BuildRequires:  hunspell-devel
@@ -71,6 +66,12 @@ GUI part of the Sonnet framework provides widgets with spell checking support.
 %prep
 %autosetup -n %{framework}-%{version} -p1
 
+# workaround multilib conflicts in trigrams.map by using QMap instead of QHash
+# https://bugzilla.redhat.com/show_bug.cgi?id=1262746
+# https://bugzilla.redhat.com/show_bug.cgi?id=1669800
+# https://bugs.kde.org/show_bug.cgi?id=403630
+sed -i.multilib -e 's|QHash|QMap|g' data/parsetrigrams.cpp
+
 
 %build
 mkdir %{_target_platform}
@@ -130,6 +131,9 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||:
 
 
 %changelog
+* Tue Jan 29 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.54.0-2
+- work harder to avoid multilib conflicts (kde#403630, #1669800)
+
 * Wed Jan 09 2019 Rex Dieter <rdieter@fedoraproject.org> - 5.54.0-1
 - 5.54.0
 - rebase multilib.patch

sonnet-multilib.patch

@@ -1,12 +0,0 @@
-diff -up sonnet-5.54.0/data/parsetrigrams.cpp.multilib sonnet-5.54.0/data/parsetrigrams.cpp
---- sonnet-5.54.0/data/parsetrigrams.cpp.multilib	2019-01-06 14:29:23.000000000 -0600
-+++ sonnet-5.54.0/data/parsetrigrams.cpp	2019-01-09 11:15:23.602706493 -0600
-@@ -44,7 +44,7 @@ int main(int argc, char **argv)
-     QString path = QLatin1String(argv[1]);
-     QDir td(path);
- 
--    QHash< QString, QHash<QString, int> > models;
-+    QMap< QString, QHash<QString, int> > models;
- 
-     for (const QString &fname : td.entryList(QDir::Files)) {
-         QFile fin(td.filePath(fname));