rpms/kdepim-runtime/devel kdepim-runtime-4.4.0-imap_disconnect.patch, NONE, 1.1 kdepim-runtime.spec, 1.23, 1.24

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdepim-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1292

Modified Files:
	kdepim-runtime.spec 
Added Files:
	kdepim-runtime-4.4.0-imap_disconnect.patch 
Log Message:
* Mon Feb 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-3
- Random akonadi_imap_resource crash (kde#220384)


kdepim-runtime-4.4.0-imap_disconnect.patch:
 imapaccount.cpp |    2 --
 1 file changed, 2 deletions(-)

--- NEW FILE kdepim-runtime-4.4.0-imap_disconnect.patch ---
--- trunk/KDE/kdepim/runtime/resources/imap/imapaccount.cpp	2010/01/12 17:38:34	1073702
+++ trunk/KDE/kdepim/runtime/resources/imap/imapaccount.cpp	2010/02/08 15:10:00	1087128
@@ -295,7 +295,6 @@
     emit error( capJob->session(),
                 CapabilitiesTestError,
                 i18n( "Could not test the capabilities supported by the IMAP server %1.", m_server ) );
-    disconnect();
     return;
   }
 
@@ -324,7 +323,6 @@
                 IncompatibleServerError,
                 i18n( "Cannot use the IMAP server %1, some mandatory capabilities are missing: %2. "
                       "Please ask your sysadmin to upgrade the server.", m_server, missing.join( ", " ) ) );
-    disconnect();
     return;
   }
 


Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/devel/kdepim-runtime.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- kdepim-runtime.spec	9 Feb 2010 19:19:01 -0000	1.23
+++ kdepim-runtime.spec	15 Feb 2010 15:36:51 -0000	1.24
@@ -2,7 +2,7 @@
 Name:    kdepim-runtime
 Summary: KDE PIM Runtime Environment
 Version: 4.4.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -10,6 +10,10 @@ URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# upstream patches
+# https://bugs.kde.org/show_bug.cgi?id=220384
+Patch100: kdepim-runtime-4.4.0-imap_disconnect.patch
+
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
 BuildRequires: akonadi-devel
@@ -49,6 +53,8 @@ Install %{name}-devel if you want to wri
 %prep
 %setup -q -n kdepim-runtime-%{version}
 
+%patch100 -p4 -b .imap_disconnect
+
 
 %build
 mkdir -p %{_target_platform}
@@ -129,6 +135,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Feb 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.4.0-3
+- Random akonadi_imap_resource crash (kde#220384)
+
 * Tue Feb 09 2010 Rex Dieter <rdieter at fedoraproject.or> - 4.4.0-2
 - libs: Requires: kdepimlibs-akonadi (instead of akonadi)