diff --git a/evolution-maildir-migrate.patch b/evolution-maildir-migrate.patch deleted file mode 100644 index 2b42dea..0000000 --- a/evolution-maildir-migrate.patch +++ /dev/null @@ -1,41 +0,0 @@ -Do not create local_mbox when user denied maildir migration - -Do not always ask for migration to maildir - - One can downgrade GConf key /apps/evolution/last_version to something - below 2.92.0 and he/she will be asked again. - - -diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c -index ffecec1..24df694 100644 ---- a/mail/e-mail-migrate.c -+++ b/mail/e-mail-migrate.c -@@ -1046,11 +1046,12 @@ migrate_local_store (EShellBackend *shell_backend) - session = (EMMigrateSession *) em_migrate_session_new (data_dir); - camel_session_set_online ((CamelSession *) session, FALSE); - -- if (migrate == GTK_RESPONSE_YES) -+ if (migrate == GTK_RESPONSE_YES) { - ret = migrate_mbox_to_maildir (shell_backend, session); - -- if (ret) -- create_mbox_account (shell_backend, session); -+ if (ret) -+ create_mbox_account (shell_backend, session); -+ } - - g_unlink (migrating_file_flag); - -@@ -1165,8 +1165,10 @@ e_mail_migrate (EShellBackend *shell_backend, - em_ensure_proxy_ignore_hosts_being_list (); - } - -- if (!migrate_local_store (shell_backend)) -- return FALSE; -+ if (major < 2 || (major == 2 && minor < 92)) { -+ if (!migrate_local_store (shell_backend)) -+ return FALSE; -+ } - - return TRUE; - } diff --git a/evolution.spec b/evolution.spec index 44cb65d..e268f12 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 2.91.3 -Release: 2%{?dist} +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -48,8 +48,6 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch -Patch14: evolution-maildir-migrate.patch - ## Dependencies ### Requires(pre): GConf2 @@ -203,7 +201,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents -%patch14 -p1 -b .maildir-migration mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -604,10 +601,6 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Thu Dec 02 2010 Milan Crha - 2.91.3-2 -- Do not create local_mbox when user denied maildir migration -- Do not always ask for migration to maildir - * Mon Nov 29 2010 Milan Crha - 2.91.3-1 - Update to 2.91.3 - Remove patch for Red Hat bug #176400 (fixed upstream)