diff --git a/kf5-sonnet.spec b/kf5-sonnet.spec index f5e3d81..82299ee 100644 --- a/kf5-sonnet.spec +++ b/kf5-sonnet.spec @@ -1,3 +1,4 @@ +%undefine __cmake_in_source_build %global framework sonnet # uncomment to enable bootstrap mode @@ -7,13 +8,13 @@ %global tests 1 %endif -Name: kf5-%{framework} -Version: 5.55.0 -Release: 1 -Summary: KDE Frameworks 5 Tier 1 solution for spell checking +Name: kf5-%{framework} +Version: 5.88.0 +Release: 1 +Summary: KDE Frameworks 5 Tier 1 solution for spell checking -License: LGPLv2+ -URL: https://cgit.kde.org/%{framework}.git +License: LGPLv2+ +URL: https://invent.kde.org/frameworks/%{framework} %global majmin %(echo %{version} | cut -d. -f1-2) %global revision %(echo %{version} | cut -d. -f3) @@ -33,8 +34,10 @@ BuildRequires: hunspell-devel %endif BuildRequires: kf5-rpm-macros >= %{majmin} BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qttools-devel BuildRequires: zlib-devel +BuildRequires: make Requires: kf5-filesystem >= %{majmin} Requires: %{name}-core%{?_isa} = %{version}-%{release} @@ -66,12 +69,6 @@ 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} @@ -98,12 +95,12 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %files %doc README.md -%license COPYING.LIB +%license LICENSES/*.txt %ldconfig_scriptlets core %files core -%{_kf5_sysconfdir}/xdg/sonnet.* +%{_kf5_datadir}/qlogging-categories5/*categories %{_kf5_libdir}/libKF5SonnetCore.so.* %if ! 0%{?bootstrap} %dir %{_kf5_plugindir}/sonnet/ @@ -111,13 +108,13 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %endif %{_kf5_bindir}/parsetrigrams %{_kf5_bindir}/gentrigrams -%dir %{_kf5_datadir}/kf5/sonnet/ -%{_kf5_datadir}/kf5/sonnet/trigrams.map +%{_kf5_qmldir}/org/kde/sonnet/ %ldconfig_scriptlets ui %files ui -f sonnet5_qt.lang %{_kf5_libdir}/libKF5SonnetUi.so.* +%{_kf5_qtplugindir}/designer/*5widgets.so %files devel %{_kf5_includedir}/sonnet_version.h @@ -131,5 +128,8 @@ make test ARGS="--output-on-failure --timeout 300" -C %{_target_platform} ||: %changelog +* Sun Jan 16 2022 pei-jiankang - 5.88.0-1 +- update to upstream version 5.88.0 + * Mon Aug 17 2020 yeqinglong - 5.55.0-1 - Initial release for OpenEuler diff --git a/kf5-sonnet.yaml b/kf5-sonnet.yaml index bdbac15..0a41d63 100644 --- a/kf5-sonnet.yaml +++ b/kf5-sonnet.yaml @@ -1,4 +1,4 @@ version_control: github src_repo: KDE/sonnet tag_prefix: "^v" -seperator: "." +separator: "." diff --git a/sonnet-5.55.0.tar.xz b/sonnet-5.55.0.tar.xz deleted file mode 100644 index d972feb..0000000 Binary files a/sonnet-5.55.0.tar.xz and /dev/null differ diff --git a/sonnet-5.88.0.tar.xz b/sonnet-5.88.0.tar.xz new file mode 100644 index 0000000..0aa8949 Binary files /dev/null and b/sonnet-5.88.0.tar.xz differ