rpms/kdebase-workspace/devel kdebase-workspace.spec,1.346,1.347

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14726

Modified Files:
	kdebase-workspace.spec 
Log Message:
upstreamed patch



Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.346
retrieving revision 1.347
diff -u -p -r1.346 -r1.347
--- kdebase-workspace.spec	14 Jan 2010 17:15:18 -0000	1.346
+++ kdebase-workspace.spec	14 Jan 2010 17:39:57 -0000	1.347
@@ -51,8 +51,6 @@ Patch17: kdebase-workspace-4.3.75-classi
 Patch19: kdebase-workspace-4.3.3-kdm_plymouth.patch
 Patch20: kdebase-workspace-4.3.80-xsession_errors_O_APPEND.patch
 Patch21: kdebase-workspace-4.3.85-no_malloc_check.patch
-# fixes KDM's build failure, should be upstreamed!
-Patch22: kdebase-workspace-4.3.90-missing_include.patch
 
 # upstream patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
@@ -65,6 +63,8 @@ Patch51: kdebase-workspace-4.3.85-bright
 Patch101: kdebase-workspace-4.3.90-kde#221871.patch
 # do not link calendar data engine with Akonadi (kde#215150,rh#552473)
 Patch102: kdebase-workspace-4.3.90-calendar_akonadi.patch
+# fixes KDM's build failure (upstreamed)
+Patch103: kdebase-workspace-4.3.90-missing_include.patch
 
 
 # moving to non-multilib hack
@@ -304,7 +304,6 @@ Requires: akonadi
 %endif
 %patch20 -p1 -b .xsession_errors_O_APPEND
 %patch21 -p1 -b .no_malloc_check
-%patch22 -p1 -b .missing_include
 
 # upstream patches
 %patch50 -p1 -b .kde#171685
@@ -312,6 +311,7 @@ Requires: akonadi
 %patch51 -p1 -b .brightness_keys
 %patch101 -p5 -b .kde#221871
 %patch102 -p1 -b .calendar_akonadi
+%patch103 -p1 -b .missing_include
 
 
 %build