From 37613aa466ed0ac5a05c0a225d7f9fdb539cc5f2 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@fedoraproject.org>
Date: Sat, 26 Feb 2011 14:56:58 -0600
Subject: [PATCH] 4.6.1

---
 .gitignore                                    |  2 +-
 ....0-fix-plasma-logout-crash-kde264076.patch | 22 -------------------
 kdelibs.spec                                  | 17 +++++++-------
 sources                                       |  2 +-
 4 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 kdelibs-4.6.0-fix-plasma-logout-crash-kde264076.patch

diff --git a/.gitignore b/.gitignore
index 28995b4..1fb1161 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kdelibs-4.6.0.tar.bz2
+/kdelibs-4.6.1.tar.bz2
diff --git a/kdelibs-4.6.0-fix-plasma-logout-crash-kde264076.patch b/kdelibs-4.6.0-fix-plasma-logout-crash-kde264076.patch
deleted file mode 100644
index 5fd8d0a..0000000
--- a/kdelibs-4.6.0-fix-plasma-logout-crash-kde264076.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 709f75ac353cd735ccac31f87363ea90dde345d3
-Author: Marco Martin <notmart@gmail.com>
-Date:   Tue Feb 1 21:15:49 2011 +0100
-
-    don't collapse when it's destroying
-    try to not crash upon deletion of the extender
-
-diff --git a/plasma/extenders/extenderitem.cpp b/plasma/extenders/extenderitem.cpp
-index bdbc886..3e5809f 100644
---- a/plasma/extenders/extenderitem.cpp
-+++ b/plasma/extenders/extenderitem.cpp
-@@ -596,6 +596,10 @@ void ExtenderItem::destroy()
- 
- void ExtenderItem::setCollapsed(bool collapsed)
- {
-+    if (extender()->d->destroying) {
-+        return;
-+    }
-+
-     config().writeEntry("isCollapsed", collapsed);
-     d->collapsed = collapsed;
-     d->collapseIcon->setToolTip(collapsed ? i18n("Expand this widget") : i18n("Collapse this widget"));
diff --git a/kdelibs.spec b/kdelibs.spec
index 1041348..c635831 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -1,9 +1,9 @@
 
-%define attica_ver 0.1.90
+%define attica_ver 0.2.0
 %define dbusmenu_qt_ver 0.5.2
-%define phonon_ver 4.4.3
+%define phonon_ver 4.4.4
 %define qt4_ver 4.7.0
-%define soprano_ver 2.5.60
+%define soprano_ver 2.6.0
 %define strigi_ver 0.7.2
 # to build/include apidocs or not
 %define apidocs 1
@@ -15,8 +15,8 @@
 %endif
 
 Summary: KDE Libraries
-Version: 4.6.0
-Release: 4%{?dist}
+Version: 4.6.1
+Release: 1%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -91,8 +91,6 @@ Patch27: kdelibs-4.5.80-no_rpath.patch
 Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
 
 ## trunk (4.6) upstream
-# fix kde#264076 - Plasma 4.6 crash on logout
-Patch100: kdelibs-4.6.0-fix-plasma-logout-crash-kde264076.patch
 
 ## security fix
 # Not Upstreamed? why not ? -- Rex
@@ -172,6 +170,7 @@ Requires: hal-storage-addon
 BuildRequires: docbook-dtds
 BuildRequires: doxygen
 BuildRequires: graphviz
+# should probably do something about removing this one, it's quite huge'ish -- Rex
 BuildRequires: qt4-doc
 %endif
 
@@ -276,7 +275,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch50 -p1 -b .knewstuff_gpg2
 
 # upstream patches
-%patch100 -p1 -b .fix-plasma-logout-crash-kde264076
 
 # security fix
 %patch200 -p1 -b .CVE-2009-2702
@@ -532,6 +530,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Feb 26 2011 Rex Dieter <rdieter@fedoraproject.org> 4.6.1-1
+- 4.6.1
+
 * Mon Feb 21 2011 Jaroslav Reznik <jreznik@redhat.com> - 4.6.0-4
 - Fix plasma logout crash (kde#264076)
 
diff --git a/sources b/sources
index cf2d8ef..e0573a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9ee32f375809a42a4a8d512bd06a612b  kdelibs-4.6.0.tar.bz2
+0cdc56a73009c65b5ad9ba3167ebb227  kdelibs-4.6.1.tar.bz2