Update to 5.8.5 (sync with :LTS)

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/discover?expand=0&rev=61

0001-Fix-arguments-when-running-.desktop-files-with-runse.patch

@@ -0,0 +1,27 @@
+From 2db9081b379614ecc19331634d31ca827b9cf9e6 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Tue, 27 Dec 2016 18:53:40 +0100
+Subject: [PATCH 1/2] Fix arguments when running .desktop files with runservice
+
+Without this patch the command run with runservice has a duplicate first argument
+as QProcess already prepends the executable name.
+---
+ libdiscover/backends/PackageKitBackend/runservice/main.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libdiscover/backends/PackageKitBackend/runservice/main.cpp b/libdiscover/backends/PackageKitBackend/runservice/main.cpp
+index b56917a..693d80c 100644
+--- a/libdiscover/backends/PackageKitBackend/runservice/main.cpp
++++ b/libdiscover/backends/PackageKitBackend/runservice/main.cpp
+@@ -39,5 +39,7 @@ int main(int argc, char** argv)
+     QTextStream cerr(stderr);
+     KIO::DesktopExecParser execParser(_service, {});
+ 
+-    return !QProcess::startDetached(KIO::DesktopExecParser::executableName(_service.exec()), execParser.resultingArguments());
++    auto args = execParser.resultingArguments();
++    const auto execName = args.takeFirst();
++    return !QProcess::startDetached(execName, args);
+ }
+-- 
+2.10.2
+

0002-Also-expose-YaST-repository-configuration-if-present.patch

@@ -0,0 +1,32 @@
+From 4b128419571bb2f45f1dfbdab21ae5419e02d77b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Tue, 27 Dec 2016 18:57:35 +0100
+Subject: [PATCH 2/2] Also expose YaST repository configuration if present
+
+Like "Expose software-properties-kde if present", but for openSUSE.
+---
+ libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
+index 3421cd1..3db1ad4 100644
+--- a/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
++++ b/libdiscover/backends/PackageKitBackend/PackageKitBackend.cpp
+@@ -99,7 +99,13 @@ PackageKitBackend::PackageKitBackend(QObject* parent)
+     connect(updateAction, &QAction::triggered, this, &PackageKitBackend::refreshDatabase);
+     m_messageActions += updateAction;
+ 
+-    const auto service = locateService(QStringLiteral("software-properties-kde.desktop"));
++    // Kubuntu-based
++    auto service = locateService(QStringLiteral("software-properties-kde.desktop"));
++    if (!service.isEmpty())
++        m_messageActions += createActionForService(service);
++
++    // openSUSE-based
++    service = locateService(QStringLiteral("YaST2/sw_source.desktop"));
+     if (!service.isEmpty())
+         m_messageActions += createActionForService(service);
+ 
+-- 
+2.10.2
+

discover-5.8.4.tar.xz

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

discover-5.8.5.tar.xz

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

discover.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Dec 27 18:31:45 UTC 2016 - fabian@ritter-vogt.de
+
+- Update to 5.8.5
+  * New bugfix release
+  * For more details please see:
+    https://www.kde.org/announcements/plasma-5.8.5.php
+- Add patches for openSUSE integration:
+  * 0001-Fix-arguments-when-running-.desktop-files-with-runse.patch
+  * 0002-Also-expose-YaST-repository-configuration-if-present.patch
+
 -------------------------------------------------------------------
 Wed Nov 23 10:59:30 UTC 2016 - fabian@ritter-vogt.de
 

discover.spec

@@ -18,13 +18,17 @@
 
 %bcond_without lang
 Name:           discover
-Version:        5.8.4
+Version:        5.8.5
 Release:        0
 Summary:        KDE Software Installer
 License:        GPL-2.0
 Group:          System/GUI/KDE
 Url:            https://quickgit.kde.org/?p=discover.git
 Source:         http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM 0001-Fix-arguments-when-running-.desktop-files-with-runse.patch fabian@ritter-vogt.de -- Fix arguments when running .desktop files with runservice
+Patch1:         0001-Fix-arguments-when-running-.desktop-files-with-runse.patch
+# PATCH-FIX-UPSTREAM 0002-Also-expose-YaST-repository-configuration-if-present.patch fabian@ritter-vogt.de -- Also expose YaST repository configuration if present
+Patch2:         0002-Also-expose-YaST-repository-configuration-if-present.patch
 BuildRequires:  PackageKit-Qt5-devel
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  extra-cmake-modules
@@ -78,6 +82,8 @@ This is the systray plasmoid to notify the user that updates are available
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
 
 %build
   %cmake_kf5 -d build
@@ -115,6 +121,7 @@ This is the systray plasmoid to notify the user that updates are available
 %{_kf5_appstreamdir}/
 %{_kf5_configdir}/discover_ktexteditor_codesnippets_core.knsrc
 %{_kf5_sharedir}/discover/
+%{_kf5_libdir}/libexec/kf5/discover/
 
 %if %{with lang}
 %files lang -f %{name}.lang