From 8c558a786fd4d7686b6ae904f52a0b14cd5cb266a09ce552688af7a04e6b148f Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 7 Mar 2015 17:19:24 +0000 Subject: [PATCH 1/2] 5.8.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=43 --- sonnet-5.7.0.tar.xz | 3 --- sonnet-5.8.0.tar.xz | 3 +++ sonnet.changes | 7 +++++++ sonnet.spec | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 sonnet-5.7.0.tar.xz create mode 100644 sonnet-5.8.0.tar.xz diff --git a/sonnet-5.7.0.tar.xz b/sonnet-5.7.0.tar.xz deleted file mode 100644 index e3c67fc..0000000 --- a/sonnet-5.7.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:197093983dc2cda20f444b82afe4892b7e9ac8cbe5b2c6484a5aeecaaefb0087 -size 272484 diff --git a/sonnet-5.8.0.tar.xz b/sonnet-5.8.0.tar.xz new file mode 100644 index 0000000..a0559e1 --- /dev/null +++ b/sonnet-5.8.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0707edd428eef2f07c80ab39ee6d77a3c0a8411c207c27efdfb11537e4c1ca25 +size 272476 diff --git a/sonnet.changes b/sonnet.changes index 6e1545a..5be2ef4 100644 --- a/sonnet.changes +++ b/sonnet.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Mar 7 16:58:57 UTC 2015 - hrvoje.senjan@gmail.com + +- Update to 5.8.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.8.0.php + ------------------------------------------------------------------- Sun Feb 8 18:15:34 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/sonnet.spec b/sonnet.spec index fe2e3e8..1541ab9 100644 --- a/sonnet.spec +++ b/sonnet.spec @@ -17,7 +17,7 @@ %define sonum 5 -%define _tar_path 5.7 +%define _tar_path 5.8 Name: sonnet Version: %{_tar_path}.0 Release: 0 @@ -25,7 +25,7 @@ BuildRequires: aspell-devel BuildRequires: cmake >= 2.8.12 # Enchant plugin is currently disabled upstream #BuildRequires: enchant-devel -BuildRequires: extra-cmake-modules >= 1.7.0 +BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: fdupes BuildRequires: kf5-filesystem BuildRequires: libqt5-linguist-devel >= 5.2.0 From 7bbf7414f1cdac397215014ad601802e6201132179a1c5b4f5c26dd841ed235a Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 7 Mar 2015 18:12:19 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/sonnet?expand=0&rev=44 --- dictionary-locations.patch | 29 +++++++++++++++++++++++++++++ sonnet.changes | 4 ++++ sonnet.spec | 5 ++++- 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 dictionary-locations.patch diff --git a/dictionary-locations.patch b/dictionary-locations.patch new file mode 100644 index 0000000..b31e52a --- /dev/null +++ b/dictionary-locations.patch @@ -0,0 +1,29 @@ +diff --git a/src/plugins/hunspell/hunspellclient.cpp b/src/plugins/hunspell/hunspellclient.cpp +index 9e3aa67..bf2ca71 100644 +--- a/src/plugins/hunspell/hunspellclient.cpp ++++ b/src/plugins/hunspell/hunspellclient.cpp +@@ -46,7 +46,7 @@ SpellerPlugin *HunspellClient::createSpeller(const QString &language) + QStringList HunspellClient::languages() const + { + QStringList lst; +- QDir dir(QStringLiteral("/usr/share/myspell/dicts/")); ++ QDir dir(QStringLiteral("/usr/share/hunspell/")); + if (dir.exists()) { + QStringList lstDic = dir.entryList(QStringList(QStringLiteral("*.dic")), QDir::Files); + foreach (const QString &tmp, lstDic) { +diff --git a/src/plugins/hunspell/hunspelldict.cpp b/src/plugins/hunspell/hunspelldict.cpp +index 621113d..5baa65f 100644 +--- a/src/plugins/hunspell/hunspelldict.cpp ++++ b/src/plugins/hunspell/hunspelldict.cpp +@@ -30,9 +30,9 @@ HunspellDict::HunspellDict(const QString &lang) + : SpellerPlugin(lang), m_speller(0) + { + qDebug() << " HunspellDict::HunspellDict( const QString& lang ):" << lang; +- QString dic = QStringLiteral("/usr/share/myspell/dicts/%1.dic").arg(lang); ++ QString dic = QStringLiteral("/usr/share/hunspell/%1.dic").arg(lang); + if (QFileInfo(dic).exists()) { +- m_speller = new Hunspell(QStringLiteral("/usr/share/myspell/dicts/%1.aff").arg(lang).toUtf8().constData(), dic.toUtf8().constData()); ++ m_speller = new Hunspell(QStringLiteral("/usr/share/hunspell/%1.aff").arg(lang).toUtf8().constData(), dic.toUtf8().constData()); + } else { + m_speller = 0; + } diff --git a/sonnet.changes b/sonnet.changes index 5be2ef4..b0816cf 100644 --- a/sonnet.changes +++ b/sonnet.changes @@ -4,6 +4,10 @@ Sat Mar 7 16:58:57 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.8.0 * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.8.0.php +- Comment out aspell-devel BuildRequires, myspell/hunspell plugin + is prefered +- Added dictionary-locations.patch: find dictionaries in openSUSE + locations ------------------------------------------------------------------- Sun Feb 8 18:15:34 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/sonnet.spec b/sonnet.spec index 1541ab9..4f5fa98 100644 --- a/sonnet.spec +++ b/sonnet.spec @@ -21,7 +21,7 @@ Name: sonnet Version: %{_tar_path}.0 Release: 0 -BuildRequires: aspell-devel +#BuildRequires: aspell-devel BuildRequires: cmake >= 2.8.12 # Enchant plugin is currently disabled upstream #BuildRequires: enchant-devel @@ -39,6 +39,8 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-OPENSUSE dictionary-locations.patch -- find dictionaries in openSUSE locations +Patch0: dictionary-locations.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -86,6 +88,7 @@ HSpell, Enchant, ASpell and HUNSPELL. Development files. %lang_package -n libKF5SonnetCore%sonum %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build -- -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert