rpms/kdepim/devel kdepim-4.2.2-korganizer-crash.patch, NONE, 1.1 kdepim.spec, 1.213, 1.214

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdepim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6069

Modified Files:
	kdepim.spec 
Added Files:
	kdepim-4.2.2-korganizer-crash.patch 
Log Message:
- apply upstream patch to fix crash in korganizer


kdepim-4.2.2-korganizer-crash.patch:

--- NEW FILE kdepim-4.2.2-korganizer-crash.patch ---
Index: korganizer/incidencechanger.cpp
===================================================================
--- korganizer/incidencechanger.cpp	(Revision 949917)
+++ korganizer/incidencechanger.cpp	(Revision 949918)
@@ -363,7 +363,7 @@
     // widgets sooner or later
     stdcal->setDialogParentWidget( tmpparent );
   }
-  if ( !success ) {
+  if ( !success && stdcal ) {
     // We can have a failure if the user pressed [cancel] in the resource
     // selectdialog, so check the exception.
     ErrorFormat *e = stdcal->exception();


Index: kdepim.spec
===================================================================
RCS file: /cvs/extras/rpms/kdepim/devel/kdepim.spec,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- kdepim.spec	1 Apr 2009 19:13:37 -0000	1.213
+++ kdepim.spec	6 Apr 2009 11:01:26 -0000	1.214
@@ -6,13 +6,15 @@
 Summary: PIM (Personal Information Manager) applications
 Epoch:   6
 Version: 4.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
 URL:	   http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 Patch0:  kdepim-4.1.80-libqgpgme-link-fix.patch
+# 4.2 upstream patches
+Patch100: kdepim-4.2.2-korganizer-crash.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -89,7 +91,7 @@
 %patch0 -p1 -b .libqgpgme-link-fix
 
 # upstream patches
-
+%patch100 -p0 -b .crash
 
 %build
 mkdir -p %{_target_platform}
@@ -186,6 +188,9 @@
 
 
 %changelog
+* Mon Apr 06 2009 Than Ngo <than at redhat.com> - 4.2.2-3
+- apply upstream patch to fix crash in korganizer
+
 * Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
 - optimize scriptlets