[kdepim] * Fri Oct 14 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:4.7.2-5 - fix KMail migration (kde#283563)

[Kevin Kofler]

commit 2bbf1c41ff852ecb4c20ed972b684fe71bd33a27
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Fri Oct 14 20:17:32 2011 +0200

    * Fri Oct 14 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:4.7.2-5
    - fix KMail migration (kde#283563)

 kdepim-4.7.2-kmail-migration.patch |   27 +++++++++++++++++++++++++++
 kdepim.spec                        |   10 ++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)
---
diff --git a/kdepim-4.7.2-kmail-migration.patch b/kdepim-4.7.2-kmail-migration.patch
new file mode 100644
index 0000000..b76dce9
--- /dev/null
+++ b/kdepim-4.7.2-kmail-migration.patch
@@ -0,0 +1,27 @@
+--- kdepim-4.7.2/kmail/kmkernel.cpp~	2011-10-07 18:31:03.000000000 +0400
++++ kdepim-4.7.2/kmail/kmkernel.cpp	2011-10-14 15:21:12.000000000 +0400
+@@ -276,11 +276,10 @@ void KMKernel::migrateFromKMail1()
+       if ( choice == KMessageBox::Cancel )
+         exit( 1 );
+ 
+-      // we only will make one attempt at this
+-      migrationCfg.writeEntry( "Version", targetVersion );
+-      migrationCfg.sync();
+-
+       if ( choice != KMessageBox::Yes ) {
++        // disable this round of migration
++        migrationCfg.writeEntry( "Version", targetVersion );
++        migrationCfg.sync();
+         return;
+       }
+ 
+@@ -296,6 +295,9 @@ void KMKernel::migrateFromKMail1()
+       }
+       if ( result && proc.exitCode() == 0 ) {
+         kDebug() << "Akonadi migration has been successful";
++        // we only will make one attempt at this
++        migrationCfg.writeEntry( "Version", targetVersion );
++        migrationCfg.sync();
+       } else {
+         // exit code 1 means it is already running, so we are probably called by a migrator instance
+         kError() << "Akonadi migration failed!";
diff --git a/kdepim.spec b/kdepim.spec
index 5707319..4c094de 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -1,8 +1,8 @@
 Name:    kdepim
 Summary: KDE PIM (Personal Information Manager) applications
-Epoch:   7 
+Epoch:   7
 Version: 4.7.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPLv2
 Group:   Applications/Productivity
@@ -15,6 +15,8 @@ Patch0:  kdepim-4.5.85-install-headers.patch
 
 # disable nepomuk/strigi notification spam 
 Patch1: kdepim-4.7.2-nepomuk_notification.patch
+# fix KMail migration (kde#283563)
+Patch2: kdepim-4.7.2-kmail-migration.patch
 
 # upstream patches
 
@@ -88,6 +90,7 @@ Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %patch0 -p1 -b .install-headers
 %patch1 -p1 -b .nepomuk_notification
+%patch2 -p1 -b .kmail-migration
 
 
 %build
@@ -209,6 +212,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Oct 14 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 7:4.7.2-5
+- fix KMail migration (kde#283563)
+
 * Thu Oct 13 2011 Rex Dieter <rdieter at fedoraproject.org> 7:4.7.2-4
 - disable akonadi nepomuk/strigi notification spam