rpms/kdepim/F-8 kdepim.spec,1.144,1.145

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26800/F-8

Modified Files:
	kdepim.spec 
Log Message:
Sync from devel:
* Mon Feb 18 2008 Than Ngo <than at redhat.com> 3.5.9-4
- backport upstream patch to fix kmail crash on startup


Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-8/kdepim.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- kdepim.spec	15 Feb 2008 22:16:29 -0000	1.144
+++ kdepim.spec	18 Feb 2008 23:42:31 -0000	1.145
@@ -37,7 +37,7 @@
 
 Release: 3.%{ent_date}svn.ent%{?dist}
 %else
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 %endif
 
@@ -58,6 +58,7 @@
 Patch4: kdepim-3.5.9-kde#127696.patch
 
 ## upstream patches
+Patch100: kdepim-3.5.x-kmail-imap-crash.patch
 
 Provides: kdepim3 = %{version}-%{release}
 
@@ -173,6 +174,8 @@
 
 %patch4 -p0 -b .kde127696
 
+%patch100 -p0 -b .kmail-imap-crash
+
 %if %{make_cvs}
    make -f admin/Makefile.common cvs
 %endif
@@ -304,6 +307,9 @@
 
 
 %changelog
+* Mon Feb 18 2008 Than Ngo <than at redhat.com> 3.5.9-4
+- backport upstream patch to fix kmail crash on startup
+
 * Fri Feb 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 6:3.5.9-3
 - backport upstream fix for kde#127696 from enterprise branch