rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert previous commit

Browse Source
This commit is contained in:
Milan Crha 2010-12-02 16:03:31 +01:00
parent 8dc03ea494
commit 4c753acada
2 changed files with 1 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
evolution-maildir-migrate.patch
View File

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

9
evolution.spec
View File

@ -29,7 +29,7 @@
Name: evolution Name: evolution
Version: 2.91.3 Version: 2.91.3
Release: 2%{?dist} Release: 1%{?dist}
Group: Applications/Productivity Group: Applications/Productivity
Summary: Mail and calendar client for GNOME Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL License: GPLv2+ and GFDL
@ -48,8 +48,6 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
# RH bug #589555 # RH bug #589555
Patch13: evolution-2.30.1-help-contents.patch Patch13: evolution-2.30.1-help-contents.patch
Patch14: evolution-maildir-migrate.patch
## Dependencies ### ## Dependencies ###
Requires(pre): GConf2 Requires(pre): GConf2
@ -203,7 +201,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
%setup -q -n evolution-%{version} %setup -q -n evolution-%{version}
%patch10 -p1 -b .ldaphack %patch10 -p1 -b .ldaphack
%patch13 -p1 -b .help-contents %patch13 -p1 -b .help-contents
%patch14 -p1 -b .maildir-migration
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -604,10 +601,6 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Thu Dec 02 2010 Milan Crha <mcrha@redhat.com> - 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 <mcrha@redhat.com> - 2.91.3-1 * Mon Nov 29 2010 Milan Crha <mcrha@redhat.com> - 2.91.3-1
- Update to 2.91.3 - Update to 2.91.3
- Remove patch for Red Hat bug #176400 (fixed upstream) - Remove patch for Red Hat bug #176400 (fixed upstream)