[kdepim] Kalarm not allowing editing or deleting of alarms (#808066)

[Rex Dieter]

commit 7103d2ab71c3519b383f1bc5821c238b44fb0352
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 29 09:20:39 2012 -0500

    Kalarm not allowing editing or deleting of alarms (#808066)

 kdepim-4.8.1-kalarm_cannot_save.patch |   19 +++++++++++++++++++
 kdepim.spec                           |    9 ++++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/kdepim-4.8.1-kalarm_cannot_save.patch b/kdepim-4.8.1-kalarm_cannot_save.patch
new file mode 100644
index 0000000..5fa03d0
--- /dev/null
+++ b/kdepim-4.8.1-kalarm_cannot_save.patch
@@ -0,0 +1,19 @@
+commit ae66e32fb194e01e06521c78e9c72d772d291261
+Author: David Jarvie <djarvie at kde.org>
+Date:   Wed Mar 7 22:08:50 2012 +0000
+
+    Fix error saving changed alarms when closing Edit Alarm dialogue
+
+diff --git a/kalarm/akonadimodel.cpp b/kalarm/akonadimodel.cpp
+index bb6ba60..2d7353b 100644
+--- a/kalarm/akonadimodel.cpp
++++ b/kalarm/akonadimodel.cpp
+@@ -1284,7 +1284,7 @@ KAEvent AkonadiModel::event(const Item& item, const QModelIndex& index, Collecti
+     if (e.isValid())
+     {
+ 
+-        Collection c = data(index, ParentCollectionRole).value<Collection>();
++        Collection c = data(ix, ParentCollectionRole).value<Collection>();
+         // Set collection ID using a const method, to avoid unnecessary copying of KAEvent
+         e.setCollectionId_const(c.id());
+         if (collection)
diff --git a/kdepim.spec b/kdepim.spec
index b0a9a47..f33b221 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -2,7 +2,7 @@ Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
 Epoch:   7
 Version: 4.8.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -24,6 +24,8 @@ Patch2: kdepim-4.7.2-kmail-migration.patch
 # upstream patches
 # fix version s/4.8.0/4.8.1
 Patch100: kdepim-4.8.1-fix-version.patch
+# kalarm can't edit/save
+Patch101: kdepim-4.8.1-kalarm_cannot_save.patch
 
 Provides: kdepim4 = %{version}-%{release}
 
@@ -98,6 +100,8 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %patch2 -p1 -b .kmail-migration
 
 %patch100 -p1 -b .fix-version
+%patch101 -p1 -b .kalarm_cannot_save
+
 
 %build
 mkdir -p %{_target_platform}
@@ -221,6 +225,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar 29 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.1-4
+- Kalarm not allowing editing or deleting of alarms (#808066)
+
 * Mon Mar 12 2012 Jaroslav Reznik <jreznik at redhat.com> - 4.8.1-3
 - fix version
 - remove g++47 patch as it's already applied upstream