Accepting request 290590 from KDE:Frameworks5

Update to 5.8.0.

OBS-URL: https://build.opensuse.org/request/show/290590
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sonnet?expand=0&rev=15
This commit is contained in:
Dominique Leuenberger 2015-03-16 08:34:21 +00:00 committed by Git OBS Bridge
commit 53860e4588
5 changed files with 49 additions and 6 deletions

View File

@ -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;
}

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:197093983dc2cda20f444b82afe4892b7e9ac8cbe5b2c6484a5aeecaaefb0087
size 272484

3
sonnet-5.8.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0707edd428eef2f07c80ab39ee6d77a3c0a8411c207c27efdfb11537e4c1ca25
size 272476

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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

View File

@ -17,15 +17,15 @@
%define sonum 5
%define _tar_path 5.7
%define _tar_path 5.8
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
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
@ -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