rpms/kdebase/devel kdebase-4.4.3-konsole-activetabindex.patch, NONE, 1.1 kdebase.spec, 1.428, 1.429 kdebase-4.1.70-konsole-session.patch, 1.1, NONE

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5024/devel

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.4.3-konsole-activetabindex.patch 
Removed Files:
	kdebase-4.1.70-konsole-session.patch 
Log Message:
* Sat May 01 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.3-2
- completely drop commented out konsole-session patch (fixed upstream)
- add backwards compatibility hack for a config option change by that patch

kdebase-4.4.3-konsole-activetabindex.patch:
 ViewManager.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-4.4.3-konsole-activetabindex.patch ---
diff -ur kdebase-4.4.3/apps/konsole/src/ViewManager.cpp kdebase-4.4.3-konsole-activetabindex/apps/konsole/src/ViewManager.cpp
--- kdebase-4.4.3/apps/konsole/src/ViewManager.cpp	2010-04-29 21:54:14.000000000 +0200
+++ kdebase-4.4.3-konsole-activetabindex/apps/konsole/src/ViewManager.cpp	2010-05-01 20:02:13.000000000 +0200
@@ -936,7 +936,7 @@
 void ViewManager::restoreSessions(const KConfigGroup& group)
 {
     QList<int> ids = group.readEntry("Sessions", QList<int>());
-    int activeTab  = group.readEntry("Active", 0);
+    int activeTab  = group.readEntry("Active", group.readEntry("ActiveTabIndex", 0));
     TerminalDisplay *display = 0;
 
     int tab = 1;


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -p -r1.428 -r1.429
--- kdebase.spec	1 May 2010 14:24:03 -0000	1.428
+++ kdebase.spec	1 May 2010 18:07:40 -0000	1.429
@@ -6,7 +6,7 @@ Name:    kdebase
 Summary: KDE Core Files
 Epoch:   6
 Version: 4.4.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -15,8 +15,9 @@ 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
+# backwards compatibility hack for a config option changed by our old
+# konsole-session patch
+Patch1:   kdebase-4.4.3-konsole-activetabindex.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
 # fix disabling automatic spell checking in the Konqueror UI (kde#228593)
 Patch3:   kdebase-4.4.0-konqueror-kde#228593.patch
@@ -126,7 +127,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-activetabindex
 %patch2 -p1 -b .home-icon
 %patch3 -p1 -b .kde#228593
 %patch4 -p1 -b .kappfinder
@@ -336,7 +337,11 @@ fi
 
 
 %changelog
-* Fri Apr 30 2010 Jaroslav Reznik <jreznik at redhat.com> 6:4.4.3-1
+* Sat May 01 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:4.4.3-2
+- completely drop commented out konsole-session patch (fixed upstream)
+- add backwards compatibility hack for a config option change by that patch
+
+* Fri Apr 30 2010 Jaroslav Reznik <jreznik at redhat.com> - 6:4.4.3-1
 - 4.4.3
 
 * Mon Mar 29 2010 Lukas Tinkl <ltinkl at redhat.com> - 6:4.4.2-1


--- kdebase-4.1.70-konsole-session.patch DELETED ---