[kdebase-workspace/f14/master: 3/4] Revert "Panel autohide fix"

[Kevin Kofler]

commit 190cc3ca5e1f2da2570e735759093ae6015c695c
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Wed Mar 30 16:20:26 2011 +0200

    Revert "Panel autohide fix"
    
    This reverts commit 313d46187064125e1b0acdf41d54aa7eccd0b3ef.
    
    We will merge master wholesale instead.

 ...ase-workspace-4.6.1-kde#258012-hide-panel.patch |  199 --------------------
 kdebase-workspace.spec                             |    9 +-
 2 files changed, 1 insertions(+), 207 deletions(-)
---
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 33530a6..1f161ab 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -8,7 +8,7 @@ Version: 4.6.1
 # for .0 releases we have to use '00' as '0' is treated as null by cmake, dont' forget to update
 %define kde4workspace_version 4.6.1
 
-Release: 5%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -70,9 +70,6 @@ Patch50: kdebase-workspace-4.3.3-kde#171685.patch
 Patch100: kdebase-workspace-4.6.1-solid_nm_emit.patch 
 # https://projects.kde.org/projects/kde/kdebase/kde-workspace/repository/revisions/c3b28d90cf2c5f9efb57bdc764361c6a596f1749
 Patch101: kdebase-workspace-4.6.1-notification_resizing.patch
-# 690450: Autohide panel gets visible on taskbar changes and does not hide itself (kde#258012)
-# https://projects.kde.org/projects/kde/kdebase/kde-workspace/repository/revisions/f506210c74ab65c8bb1d6de3b2332d374c7cbfcc
-Patch102: kdebase-workspace-4.6.1-kde#258012-hide-panel.patch
 
 ## Fedora specific patches
 # HALsectomy
@@ -316,7 +313,6 @@ Requires: akonadi
 # 4.6 patches
 %patch100 -p1 -b .solid_nm_emit
 %patch101 -p1 -b .notification_resizing
-%patch102 -p1 -b .kde#258012-hide-panel
 
 # trunk patches
 
@@ -738,9 +734,6 @@ fi
 
 
 %changelog
-* Wed Mar 30 2011 Jaroslav Reznik <jreznik at redhat.com> 4.6.1-5
-- Autohide panel gets visible and does not hide itself (#690450)
-
 * Thu Mar 24 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.1-4
 - Notification size increases randomly and cant be restored (#688967)