rpms/kdebase-workspace/devel kdebase-workspace.spec, 1.39, 1.40 kdebase-workspace-4.0.1-kde#155974.patch, 1.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6679/devel

Modified Files:
	kdebase-workspace.spec 
Removed Files:
	kdebase-workspace-4.0.1-kde#155974.patch 
Log Message:
* Fri Feb 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-2
- drop upstreamed kde#155974 patch


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- kdebase-workspace.spec	28 Feb 2008 18:01:59 -0000	1.39
+++ kdebase-workspace.spec	29 Feb 2008 21:38:42 -0000	1.40
@@ -6,7 +6,7 @@
 Name: kdebase-workspace
 Version: 4.0.2
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -18,10 +18,6 @@
 # http://bugs.kde.org/155362 (show Name in addition to GenericName in simple menu)
 # backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=762886
 Patch3: kdebase-workspace-4.0.1-kde#155362.patch
-# http://bugs.kde.org/155974 (allow taskbar to have more than one row of items)
-# backported from trunk (KDE 4.1): http://websvn.kde.org/?view=rev&revision=763873
-# This will be in 4.0.2: http://websvn.kde.org/?view=rev&revision=775713
-Patch4: kdebase-workspace-4.0.1-kde#155974.patch
 
 # upgrade path for former kde-redhat'ers
 Obsoletes: kdebase-kdm < 6:%{version}-%{release}
@@ -109,7 +105,6 @@
 # ConsoleKit support for KDM (#228111, kde#147790)
 %patch2 -p1 -b .consolekit
 %patch3 -p1 -b .kde#155362
-%patch4 -p0 -b .kde#155974
 
 
 %build
@@ -223,6 +218,9 @@
 
 
 %changelog
+* Fri Feb 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.2-2
+- drop upstreamed kde#155974 patch
+
 * Thu Feb 28 2008 Than Ngo <than at redhat.com> 4.0.2-1
 - 4.0.2
 


--- kdebase-workspace-4.0.1-kde#155974.patch DELETED ---