rpms/kdelibs/devel kdelibs.spec,1.469,1.470

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27808/devel

Modified Files:
	kdelibs.spec 
Log Message:
Sync from F11:

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

(No separate build needed.)


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.469
retrieving revision 1.470
diff -u -r1.469 -r1.470
--- kdelibs.spec	20 Apr 2009 13:08:29 -0000	1.469
+++ kdelibs.spec	21 Apr 2009 15:07:16 -0000	1.470
@@ -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 @@
 # 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 @@
 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 @@
 %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 @@
 %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 @@
 
 
 %changelog
+* Tue Apr 21 2009 Than Ngo <than at redhat.com> - 4.2.2-9
+- don't let plasma appear over screensaver
+
 * Mon Apr 20 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.2-8
 - fix Plasma PopupApplet configuration interfering with weather applet (#495998)