rpms/kdepimlibs/F-9 fix-invitations.diff, NONE, 1.1 .cvsignore, 1.20, 1.21 kdepimlibs.spec, 1.38, 1.39

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepimlibs/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15890

Modified Files:
	.cvsignore kdepimlibs.spec 
Added Files:
	fix-invitations.diff 
Log Message:
* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
- invitations crasher/regression (kde #170203)


fix-invitations.diff:

--- NEW FILE fix-invitations.diff ---
--- branches/KDE/4.1/kdepimlibs/kcal/incidenceformatter.cpp	2008/09/03 18:28:53	856767
+++ branches/KDE/4.1/kdepimlibs/kcal/incidenceformatter.cpp	2008/09/03 18:33:54	856768
@@ -1132,6 +1132,9 @@
     IncidenceCompareVisitor() : mExistingIncidence( 0 ) {}
     bool act( IncidenceBase *incidence, Incidence *existingIncidence )
     {
+      if (!existingIncidence) {
+        return false;
+      }
       Incidence *inc = dynamic_cast<Incidence *>( incidence );
       if ( inc && inc->revision() <= existingIncidence->revision() ) {
         return false;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	25 Jul 2008 11:39:53 -0000	1.20
+++ .cvsignore	5 Sep 2008 14:45:49 -0000	1.21
@@ -1,2 +1,3 @@
 kdepimlibs-4.0.99.tar.bz2
 kdepimlibs-4.1.0.tar.bz2
+kdepimlibs-4.1.1.tar.bz2


Index: kdepimlibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepimlibs/F-9/kdepimlibs.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- kdepimlibs.spec	29 Aug 2008 19:25:40 -0000	1.38
+++ kdepimlibs.spec	5 Sep 2008 14:45:49 -0000	1.39
@@ -14,7 +14,7 @@
 Name: kdepimlibs
 
 Version: 4.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: K Desktop Environment 4 - PIM Libraries
 
 License: LGPLv2
@@ -40,6 +40,10 @@
 # pulling in phonon-backend-xine
 #BuildRequires: phonon-backend-gstreamer
 
+## upstream patches
+# http://bugs.kde.org/170203
+Patch100: fix-invitations.diff
+
 %if 0%{?apidocs}
 BuildRequires: doxygen
 BuildRequires: graphviz
@@ -75,6 +79,8 @@
 %prep
 %setup -q -n kdepimlibs-%{version}
 
+%patch100 -p4 -b .invitations
+
 
 %build
 
@@ -165,6 +171,9 @@
 
 
 %changelog
+* Fri Sep 05 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.1-2
+- invitations crasher/regression (kde #170203)
+
 * Thu Aug 28 2008 Than Ngo <than at redhat.com> 4.1.1-1
 - 4.1.1