Accepting request 496999 from home:Vogtinator:susehelpless

OBS-URL: https://build.opensuse.org/request/show/496999
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcmutils?expand=0&rev=120
This commit is contained in:
Luca Beltrame 2017-05-20 19:58:57 +00:00 committed by Git OBS Bridge
parent c7eb671883
commit 106852dabf
3 changed files with 5 additions and 16 deletions

View File

@ -1,13 +0,0 @@
diff --git a/src/kcmultidialog.cpp b/src/kcmultidialog.cpp
index 6dbfa33..c68b12f 100644
--- a/src/kcmultidialog.cpp
+++ b/src/kcmultidialog.cpp
@@ -377,7 +377,7 @@ void KCMultiDialog::slotHelpClicked()
QUrl docUrl = QUrl(QStringLiteral("help:/")).resolved(QUrl(docPath)); // same code as in KHelpClient::invokeHelp
if (docUrl.scheme() == QLatin1String("help") || docUrl.scheme() == QLatin1String("man") || docUrl.scheme() == QLatin1String("info")) {
- QProcess::startDetached(QStringLiteral("khelpcenter"), QStringList() << docUrl.toString());
+ QProcess::startDetached(QStringLiteral("susehelp"), QStringList() << docUrl.toString());
} else {
QDesktopServices::openUrl(docUrl);
}

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 18 14:48:45 UTC 2017 - fabian@ritter-vogt.de
- Drop kcmutils-use-susehelp.patch (boo#1039086)
-------------------------------------------------------------------
Mon May 15 13:53:12 CEST 2017 - fabian@ritter-vogt.de

View File

@ -47,8 +47,6 @@ 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 kcmutils-use-susehelp.patch -- Use susehelp wrapper, instead of khelpcenter command (we use khelpcenter5)
Patch0: kcmutils-use-susehelp.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -82,7 +80,6 @@ created with the KConfigWidgets framework. Development files.
%lang_package -n %lname
%prep
%setup -q
%patch0 -p1
%build
%cmake_kf5 -d build