[kdebase-workspace] * Sat Oct 15 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7.2-6 - drop displayEvents patch, moved to

[Kevin Kofler]

commit 65a2afacd99282d991bb2832c7017b9c85fd6ae7
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Oct 15 20:38:20 2011 +0200

    * Sat Oct 15 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7.2-6
    - drop displayEvents patch, moved to kde-settings (in kde-settings-4.7-12)

 kde-workspace-4.7.2-displayEvents_default.patch |   12 ------------
 kdebase-workspace.spec                          |   11 ++++-------
 2 files changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index f4c356a..4b132a8 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -9,7 +9,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.7.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -66,11 +66,6 @@ Patch23: kdebase-workspace-4.5.2-startkde_zenity.patch
 # multilib QT_PLUGIN_PATH, http://bugzilla.redhat.com/704840
 Patch24: kdebase-workspace-4.6.90-multilib_qt_plugin_path.patch
 
-# plasmaclock displayEvents=false default, one more item to avoid
-# starting akonadi by default
-# FIXME/TODO: implement this via config to plasma javascript somehow?
-Patch25: kde-workspace-4.7.2-displayEvents_default.patch 
-
 ## upstreamable patches:
 # "keyboard stops working", https://bugs.kde.org/show_bug.cgi?id=171685#c135
 Patch50: kdebase-workspace-4.6.80-kde#171685.patch
@@ -354,7 +349,6 @@ pushd %{name}-%{version}
 %patch21 -p1 -b .platformplugin-widgetstyle4
 %patch23 -p1 -b .startkde_zenity
 %patch24 -p1 -b .multilib_qt_plugin_path
-%patch25 -p1 -b .displayEvents_default
 
 # upstreamable patches
 %patch50 -p1 -b .kde#171685
@@ -847,6 +841,9 @@ fi
 
 
 %changelog
+* Sat Oct 15 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.7.2-6
+- drop displayEvents patch, moved to kde-settings (in kde-settings-4.7-12)
+
 * Thu Oct 13 2011 Rex Dieter <rdieter at fedoraproject.org> 4.7.2-5
 - ksysguard: include ksysguard.desktop