rpms/kdebase/F-12 kdebase.spec,1.414,1.415

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdebase/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv1598/F-12

Modified Files:
	kdebase.spec 
Log Message:
sync w/devel



Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-12/kdebase.spec,v
retrieving revision 1.414
retrieving revision 1.415
diff -u -p -r1.414 -r1.415
--- kdebase.spec	1 May 2010 12:10:43 -0000	1.414
+++ kdebase.spec	1 May 2010 14:25:24 -0000	1.415
@@ -15,6 +15,7 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
+# backport from kde-4.2, why are we still carrying this?  -- Rex
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
 # fix disabling automatic spell checking in the Konqueror UI (kde#228593)
@@ -125,7 +126,7 @@ Requires: kdelibs4%{?_isa} >= %{version}
 %prep
 %setup -q -n kdebase-%{version}%{?alphatag}
 %patch0 -p1 -b .nsplugins-paths
-%patch1 -p1 -b .konsole-session
+#patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
 %patch3 -p1 -b .kde#228593
 %patch4 -p1 -b .kappfinder