rpms/kdepim-runtime/F-12 kdepim-runtime-4.4.0-imap_disconnect.patch, NONE, 1.1 kdepim-runtime-4.4.0-show-akonadi-kcm.patch, NONE, 1.1 kdepim-runtime.spec, 1.13, 1.14

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdepim-runtime/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18512/F-12

Modified Files:
	kdepim-runtime.spec 
Added Files:
	kdepim-runtime-4.4.0-imap_disconnect.patch 
	kdepim-runtime-4.4.0-show-akonadi-kcm.patch 
Log Message:
Sync from devel:

* Mon Feb 15 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.0-4
- show the Akonadi KCM in System Settings (#565420)

* 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;
   }
 

kdepim-runtime-4.4.0-show-akonadi-kcm.patch:
 kcm_akonadi.desktop |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdepim-runtime-4.4.0-show-akonadi-kcm.patch ---
diff -ur kdepim-runtime-4.4.0/kcm/kcm_akonadi.desktop kdepim-runtime-4.4.0-show-akonadi-kcm/kcm/kcm_akonadi.desktop
--- kdepim-runtime-4.4.0/kcm/kcm_akonadi.desktop	2010-02-04 10:33:11.000000000 +0100
+++ kdepim-runtime-4.4.0-show-akonadi-kcm/kcm/kcm_akonadi.desktop	2010-02-15 17:23:05.000000000 +0100
@@ -8,9 +8,10 @@
 X-KDE-Library=kcm_akonadi
 X-KDE-FactoryName=kcm_akonadi
 X-KDE-HasReadOnlyMode=false
-X-KDE-ParentApp=
+X-KDE-ParentApp=kcontrol
 X-KDE-ParentComponents=
 X-KDE-CfgDlgHierarchy=
+X-KDE-System-Settings-Parent-Category=advanced-user-settings
 
 Name=Akonadi Configuration
 Name[ar]=ضبط اكوندا


Index: kdepim-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim-runtime/F-12/kdepim-runtime.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- kdepim-runtime.spec	10 Feb 2010 16:16:40 -0000	1.13
+++ kdepim-runtime.spec	16 Feb 2010 14:37:57 -0000	1.14
@@ -2,7 +2,7 @@
 Name:    kdepim-runtime
 Summary: KDE PIM Runtime Environment
 Version: 4.4.0
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 Group: Applications/Productivity
@@ -10,6 +10,13 @@ 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)
 
+# show the Akonadi KCM in System Settings (#565420)
+Patch0: kdepim-runtime-4.4.0-show-akonadi-kcm.patch
+
+# 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 +56,9 @@ Install %{name}-devel if you want to wri
 %prep
 %setup -q -n kdepim-runtime-%{version}
 
+%patch0 -p1 -b .show-akonadi-kcm
+%patch100 -p4 -b .imap_disconnect
+
 
 %build
 mkdir -p %{_target_platform}
@@ -129,6 +139,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Feb 15 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.4.0-4
+- show the Akonadi KCM in System Settings (#565420)
+
+* 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)