[kdepim/f14/master] - upstream fix for knode unsubscribe crasher (kde#248256)

[Rex Dieter]

commit 23353f88742ea8fa5f8f7300830f83b6d3c182e4
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 13 08:04:11 2011 -0600

    - upstream fix for knode unsubscribe crasher (kde#248256)

 kdepim-4.4.9-kde248256.patch |   10 ++++++++++
 kdepim.spec                  |   11 +++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/kdepim-4.4.9-kde248256.patch b/kdepim-4.4.9-kde248256.patch
new file mode 100644
index 0000000..ccce917
--- /dev/null
+++ b/kdepim-4.4.9-kde248256.patch
@@ -0,0 +1,10 @@
+--- branches/KDE/4.4/kdepim/knode/kncollectionview.cpp	2010/05/23 15:40:28	1129743
++++ branches/KDE/4.4/kdepim/knode/kncollectionview.cpp	2011/01/02 19:03:11	1210953
+@@ -172,6 +172,7 @@
+   if (!g->listItem())
+     return;
+ 
++  g->listItem()->setHidden( true ); // work around bug 248256
+   delete g->listItem();
+   g->setListItem(0);
+ }
diff --git a/kdepim.spec b/kdepim.spec
index 3a965c8..791ff85 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -5,7 +5,7 @@ Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.4.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -27,6 +27,8 @@ Patch2: kdepim-4.4.5-libassuan1.patch
 ## upstreamable patches
 
 ## upstream patches
+# fix knode crasher, http://bugs.kde.org/248256
+Patch100: kdepim-4.4.9-kde248256.patch
 
 Obsoletes: bilbo < 1:1.0
 %if 0%{?fedora} < 13
@@ -120,6 +122,8 @@ Obsoletes: kdepim-devel < 6:4.3.95-1
 %patch2 -p1 -b .libassuan1
 %endif
 
+%patch100 -p4 -b .kde258256
+
 
 %build
 mkdir -p %{_target_platform}
@@ -241,7 +245,10 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Dec 23 2010 Rex Dieter <rdieter at fedoraproject.org> 4.4.9-1
+* Thu Jan 13 2011 Rex Dieter <rdieter at fedoraproject.org> 6:4.4.9-2
+- upstream fix for knode unsubscribe crasher (kde#248256)
+
+* Thu Dec 23 2010 Rex Dieter <rdieter at fedoraproject.org> 6:4.4.9-1
 - 4.4.9
 
 * Sat Dec 04 2010 Rex Dieter <rdieter at fedoraproject.org> 6:4.4.8-1