[kdelibs] plasma-pk: fix plasmapkg (#1065688)

[Kevin Kofler]

commit 558270b8dcb1f6aabc57394f64b82e48a758227a
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sun Feb 16 00:31:34 2014 +0100

    plasma-pk: fix plasmapkg (#1065688)
    
    * Sat Feb 15 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.12.2-3
    - Plasma PackageKit integration: fix plasmapkg to not query Plasma for available
      script engines if component is not Plasma/*, but e.g. KWin/Script (#1065688)

 ...tallation-of-missing-components-when-inst.patch |    5 +++--
 kdelibs.spec                                       |    6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/0002-Trigger-installation-of-missing-components-when-inst.patch b/0002-Trigger-installation-of-missing-components-when-inst.patch
index 504f7a3..c24de35 100644
--- a/0002-Trigger-installation-of-missing-components-when-inst.patch
+++ b/0002-Trigger-installation-of-missing-components-when-inst.patch
@@ -13,7 +13,7 @@ diff -up kdelibs-4.8.90/plasma/package.cpp.libplasma-pk-0002 kdelibs-4.8.90/plas
  #include "private/package_p.h"
  #include "private/plasmoidservice_p.h"
  #include "private/service_p.h"
-@@ -580,6 +583,41 @@ bool Package::installPackage(const QStri
+@@ -580,6 +583,42 @@ bool Package::installPackage(const QStri
          // no need to remove the temp dir (which has been successfully moved if it's an archive)
          tempdir.setAutoRemove(false);
      }
@@ -35,7 +35,8 @@ diff -up kdelibs-4.8.90/plasma/package.cpp.libplasma-pk-0002 kdelibs-4.8.90/plas
 +        if (serviceTypes.contains("Plasma/Wallpaper")) {
 +            componentTypes |= WallpaperComponent;
 +        }
-+        if (!knownLanguages(componentTypes).contains(requiredScriptEngine)) {
++        if (componentTypes // ignore non-Plasma/* components (e.g. KWin/Script)
++            && !knownLanguages(componentTypes).contains(requiredScriptEngine)) {
 +            // install the missing script engine
 +            // force prompting because the user has just explicitly installed a widget
 +            ComponentInstaller::self()->installMissingComponent("scriptengine", requiredScriptEngine, 0, true);
diff --git a/kdelibs.spec b/kdelibs.spec
index 41ce57c..8c89de6 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -39,7 +39,7 @@
 
 Summary: KDE Libraries
 Version: 4.12.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -624,6 +624,10 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
 
 
 %changelog
+* Sat Feb 15 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.12.2-3
+- Plasma PackageKit integration: fix plasmapkg to not query Plasma for available
+  script engines if component is not Plasma/*, but e.g. KWin/Script (#1065688)
+
 * Sun Feb 02 2014 Rex Dieter <rdieter at fedoraproject.org> - 6:4.12.2-2
 - drop autostart-debug.patch