rpms/kdebase/F-10 kdebase-4.2.2-konsole-flowcontrol.patch, NONE, 1.1 kdebase.spec, 1.362, 1.363

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdebase/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3528/F-10

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.2.2-konsole-flowcontrol.patch 
Log Message:
#496447 -  fix disabling konsole's flow control


kdebase-4.2.2-konsole-flowcontrol.patch:

--- NEW FILE kdebase-4.2.2-konsole-flowcontrol.patch ---
--- kdebase/apps/konsole/src/EditProfileDialog.cpp	2009/04/17 14:36:49	955412
+++ kdebase/apps/konsole/src/EditProfileDialog.cpp	2009/04/17 14:36:52	955413
@@ -71,11 +71,6 @@
     // - Renable in a later KDE 4.x release when this feature works again
     _ui->enableResizeWindowButton->setVisible(false);
     
-#ifdef __GNUC__
-#warning "Re-enable when flow control is working again - bug in KDE 4.1"
-#endif
-    _ui->enableFlowControlButton->setEnabled(false);
-
     // there are various setupXYZPage() methods to load the items
     // for each page and update their states to match the profile
     // being edited.


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-10/kdebase.spec,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- kdebase.spec	3 Apr 2009 12:25:46 -0000	1.362
+++ kdebase.spec	21 Apr 2009 15:37:04 -0000	1.363
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Core Files
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase
@@ -29,6 +29,7 @@
 Patch2:   kdebase-4.2.1-home-icon.patch
 
 # upstream patches
+Patch100: kdebase-4.2.2-konsole-flowcontrol.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -124,6 +125,7 @@
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
+%patch100 -p1 -b .konsole-flowcontrol
 
 # 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
@@ -315,7 +317,10 @@
 
 
 %changelog
-* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org. 4.2.2-2
+* Tue Apr 21 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-3
+- #496447 -  fix disabling konsole's flow control
+
+* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets
 
 * Mon Mar 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.2-1