Sync from F11:

* Tue Apr 21 2009 Than Ngo <than@redhat.com> - 4.2.2-9
- don't let plasma appear over screensaver

(No separate build needed.)

kdelibs.spec

@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -83,7 +83,6 @@ Patch23: kdelibs-4.2.0-gcc44-workaround.patch
 # disable strict aliasing in kjs/dtoa.cpp (GCC 4.4 x86_64 crash) (#485968)
 Patch24: kdelibs-4.2.0-kjs-gcc44-crash.patch
 Patch25: kdelibs-4.2.0-gcc44-misc.patch
-Patch26: kdelibs-4.2.2-plasma-focus.patch
 # kconf_update script for Patch201 - to be upstreamed
 Patch27: kdelibs-4.2.2-popupapplet-kconf_update.patch
 
@@ -94,6 +93,7 @@ Patch101: kdelibs-4.2.2-kjob.patch
 Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
 Patch103: kdelibs-4.2.2-kde#180785.patch
 Patch104: kdelibs-4.2.2-kde#180785-2.patch
+Patch105: kdelibs-4.2.2-plasma-focus.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -232,7 +232,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch23 -p1 -b .gcc44
 %patch24 -p1 -b .kjs-gcc44-crash
 %patch25 -p1 -b .gcc44-misc
-%patch26 -p1 -b .kickoff-focus
 %patch27 -p1 -b .popupapplet-kconf_update
 
 # upstream patches
@@ -242,6 +241,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch102 -p4 -b .bidi-kde#189161
 %patch103 -p4 -b .kde#180785
 %patch104 -p4 -b .kde#180785-2
+%patch105 -p1 -b .kickoff-focus
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -428,6 +428,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Apr 21 2009 Than Ngo <than@redhat.com> - 4.2.2-9
+- don't let plasma appear over screensaver
+
 * Mon Apr 20 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.2.2-8
 - fix Plasma PopupApplet configuration interfering with weather applet (#495998)