From daf92b7b7d7cf87c011650ead15aaba8700898bf Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 18 Apr 2016 09:27:16 -0500 Subject: [PATCH] 5.21.0-3 - update URL - support bootstrapping - add support for hunspell-1.4 --- kf5-sonnet.spec | 23 +++++++++++++++++------ sonnet-hunspell14.patch | 12 ++++++++++++ 2 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 sonnet-hunspell14.patch diff --git a/kf5-sonnet.spec b/kf5-sonnet.spec index 9850339..6a060ac 100644 --- a/kf5-sonnet.spec +++ b/kf5-sonnet.spec @@ -1,12 +1,15 @@ %global framework sonnet +# bootstrap without backend plugins +#global bootstrap 1 + Name: kf5-%{framework} Version: 5.21.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Frameworks 5 Tier 1 solution for spell checking License: LGPLv2+ -URL: https://projects.kde.org/sonnet +URL: https://quickgit.kde.org/?p=%{framework}.git %global versiondir %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -23,9 +26,13 @@ Patch1: sonnet-5.15.0-qDebug.patch # 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 +# support hunspell-1.4 +Patch3: sonnet-hunspell14.patch BuildRequires: extra-cmake-modules >= %{version} +%if ! 0%{?bootstrap} BuildRequires: hunspell-devel +%endif BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qttools-devel @@ -59,10 +66,7 @@ GUI part of the Sonnet framework provides widgets with spell checking support. %prep -%setup -q -n %{framework}-%{version} - -%patch1 -p1 -b .qDebug -%patch2 -p1 -b .multilib +%autosetup -n %{framework}-%{version} -p1 %build @@ -91,7 +95,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %files core %{_kf5_libdir}/libKF5SonnetCore.so.* %dir %{_kf5_plugindir}/sonnet/ +%if ! 0%{?bootstrap} %{_kf5_plugindir}/sonnet/hunspell.so +%endif %dir %{_kf5_datadir}/kf5/sonnet/ %{_kf5_datadir}/kf5/sonnet/trigrams.map @@ -113,6 +119,11 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Mon Apr 18 2016 Rex Dieter - 5.21.0-3 +- update URL +- support bootstrapping +- add support for hunspell-1.4 + * Mon Apr 18 2016 Caolán McNamara - 5.21.0-2 - rebuild for hunspell 1.4.0 diff --git a/sonnet-hunspell14.patch b/sonnet-hunspell14.patch new file mode 100644 index 0000000..ee71fd1 --- /dev/null +++ b/sonnet-hunspell14.patch @@ -0,0 +1,12 @@ +diff -up sonnet-5.21.0/cmake/FindHUNSPELL.cmake.hunspell14 sonnet-5.21.0/cmake/FindHUNSPELL.cmake +--- sonnet-5.21.0/cmake/FindHUNSPELL.cmake.hunspell14 2016-04-03 16:08:41.000000000 -0500 ++++ sonnet-5.21.0/cmake/FindHUNSPELL.cmake 2016-04-18 09:21:15.566064172 -0500 +@@ -14,7 +14,7 @@ ENDIF (HUNSPELL_INCLUDE_DIR AND HUNSPELL + + FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx ) + +-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.3 hunspell-1.2) ++FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.4 hunspell-1.3 hunspell-1.2) + + # handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE if + # all listed variables are TRUE