rpms/kdebase/F-11 kdebase.spec,1.385,1.386

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29201/F-11

Modified Files:
	kdebase.spec 
Log Message:
* Wed Nov 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-3
- allow 'Open Folder in Tabs' in Konsole to support SSH bookmarks (kde#177637)
  (upstream patch backported from 4.4)


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-11/kdebase.spec,v
retrieving revision 1.385
retrieving revision 1.386
diff -u -p -r1.385 -r1.386
--- kdebase.spec	9 Nov 2009 18:06:52 -0000	1.385
+++ kdebase.spec	11 Nov 2009 12:37:05 -0000	1.386
@@ -3,7 +3,7 @@ Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Epoch: 6
 Version: 4.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -16,7 +16,10 @@ Patch0:   kdebase-4.1.80-nsplugins-paths
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
 
-# 4.3 upstream patches
+# 4.4 (backported from trunk) upstream patches
+# Allow 'Open Folder in Tabs' in Konsole to support SSH bookmarks (kde#177637)
+# http://websvn.kde.org/?revision=1033653&view=revision
+Patch100: kdebase-4.3.3-konsole-kde#177637.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -110,7 +113,8 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
 
-# 4.3 upstream patches
+# 4.4 (backported from trunk) upstream patches
+%patch100 -p0 -b .konsole-kde#177637
 
 # fix incorrect assumption that we're building in a combined kdebase tree
 sed -i -e 's/EXISTS "${kdebase_SOURCE_DIR}"/0/g' apps/CMakeLists.txt
@@ -233,6 +237,10 @@ fi
 
 
 %changelog
+* Wed Nov 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.3-3
+- allow 'Open Folder in Tabs' in Konsole to support SSH bookmarks (kde#177637)
+  (upstream patch backported from 4.4)
+
 * Mon Nov 09 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.3-2
 - BR: webkitpart-devel >= 0.0.2