From 960f9d93bd40dd224cc6d72838ab07c30306cc6a Mon Sep 17 00:00:00 2001
From: Jaroslav Reznik <jreznik@redhat.com>
Date: Apr 30 2012 12:52:00 +0000
Subject: 4.8.3


- removed Dolphin timeout patch

---

diff --git a/.gitignore b/.gitignore
index 817bb2a..fbffd5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/kde-baseapps-4.8.1.tar.xz
-/kde-baseapps-4.8.2.tar.xz
+/kde-baseapps-4.8.3.tar.xz
diff --git a/kde-baseapps-4.8.2-dolphin_timeout.patch b/kde-baseapps-4.8.2-dolphin_timeout.patch
deleted file mode 100644
index 45c830a..0000000
--- a/kde-baseapps-4.8.2-dolphin_timeout.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit d8732a59d3b1f2d0bebf43f294df7e9f333abde4
-Author: Frank Reininghaus <frank78ac@googlemail.com>
-Date:   Thu Apr 5 18:59:58 2012 +0200
-
-    Reduce the timeout in KItemListKeyboardSearchManager to 1 second
-    
-    It turned out that the longer timeout, introduced recently in
-    02eab49b2de51c31fe46a0d9501327b579b3648e, not only made multi-letter
-    keyboard searches easier, but also had some unwanted side effects. I
-    hope that 1 second, which is between the previous value of 5 seconds and
-    the pre-KDE 4.8.2 value of 0.4 seconds, is a compromise which will fit
-    most users' needs.
-    We will try to improve the situation further in future releases by
-    providing visual feedback about the keyboard search, but such a change
-    would not be suitable for a bug-fix release.
-    CCBUG:297458
-    CCBUG:297488
-
-diff --git a/dolphin/src/kitemviews/kitemlistkeyboardsearchmanager.cpp b/dolphin/src/kitemviews/kitemlistkeyboardsearchmanager.cpp
-index f4dc1a5..592605a 100644
---- a/dolphin/src/kitemviews/kitemlistkeyboardsearchmanager.cpp
-+++ b/dolphin/src/kitemviews/kitemlistkeyboardsearchmanager.cpp
-@@ -29,7 +29,7 @@
- 
- KItemListKeyboardSearchManager::KItemListKeyboardSearchManager(QObject* parent) :
-     QObject(parent),
--    m_timeout(5000)
-+    m_timeout(1000)
- {
-     m_keyboardInputTime.invalidate();
- }
diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index 7e89cdc..4378db5 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -1,7 +1,7 @@
 Name:    kde-baseapps
 Summary: KDE Core Applications 
-Version: 4.8.2
-Release: 2%{?dist}
+Version: 4.8.3
+Release: 1%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-baseapps 
@@ -28,8 +28,6 @@ Patch3: kdebase-4.4.0-konqueror-kde#228593.patch
 Patch4: kdebase-4.3.4-bz#609039-chfn-parse.patch
 
 ## upstream patches
-# https://projects.kde.org/projects/kde/kde-baseapps/repository/revisions/d8732a59d3b1f2d0bebf43f294df7e9f333abde4
-Patch100: kde-baseapps-4.8.2-dolphin_timeout.patch
 
 %ifnarch s390 s390x
 Requires: eject
@@ -115,7 +113,6 @@ Requires: kdelibs4-devel kdepimlibs4-devel
 %patch2 -p2 -b .home-icon
 %patch3 -p2 -b .kde#228593
 %patch4 -p2 -b .bz#631481
-%patch100 -p1 -b .dolphin_timeout
 
 
 %build
@@ -267,6 +264,10 @@ fi
 
 
 %changelog
+* Mon Apr 30 2012 Jaroslav Reznik <jreznik@redhat.com> - 4.8.3-1
+- 4.8.3
+- removed Dolphin timeout patch
+
 * Mon Apr 16 2012 Rex Dieter <rdieter@fedoraproject.org> 4.8.2-2
 - dolphin keyboard search timeout improvement (kde#297458, kde#297488)
 
diff --git a/sources b/sources
index 93aabcb..b0a8cdf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-561cf69f77973262dcda3ca7e79af5ce  kde-baseapps-4.8.2.tar.xz
+c0a92dd1c23af86e07e2541f4a8bc07e  kde-baseapps-4.8.3.tar.xz