rpms/evolution/devel .cvsignore, 1.58, 1.59 evolution-2.8.1-ethread.patch, 1.1, 1.2 evolution.spec, 1.199, 1.200 sources, 1.58, 1.59 evolution-2.8.1-fix-search-state-crash.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Oct 17 02:35:07 UTC 2006
Author: mbarnes
Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv369
Modified Files:
.cvsignore evolution-2.8.1-ethread.patch evolution.spec
sources
Removed Files:
evolution-2.8.1-fix-search-state-crash.patch
Log Message:
* Mon Oct 16 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.1-1.fc7
- Update to 2.9.1
- Bump eds_version to 1.9.1, evo_major to 2.10.
- Remove patch for Gnome.org bug #359236 (fixed upstream).
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore 16 Oct 2006 19:21:38 -0000 1.58
+++ .cvsignore 17 Oct 2006 02:35:05 -0000 1.59
@@ -1 +1 @@
-evolution-2.8.1.tar.bz2
+evolution-2.9.1.tar.bz2
evolution-2.8.1-ethread.patch:
calendar/gui/alarm-notify/alarm-notify.c | 85 -----
calendar/gui/alarm-notify/alarm-notify.h | 13
calendar/gui/alarm-notify/alarm-queue.c | 320 +++++++++-----------
mail/em-composer-utils.c | 10
mail/em-folder-browser.c | 2
mail/em-folder-properties.c | 2
mail/em-folder-tree.c | 4
mail/em-folder-utils.c | 4
mail/em-folder-view.c | 8
mail/em-format-html-print.c | 2
mail/em-format-html.c | 2
mail/em-subscribe-editor.c | 6
mail/importers/elm-importer.c | 2
mail/importers/mail-importer.c | 2
mail/importers/pine-importer.c | 2
mail/mail-component.c | 2
mail/mail-folder-cache.c | 2
mail/mail-mt.c | 157 +++------
mail/mail-mt.h | 17 -
mail/mail-ops.c | 50 +--
mail/mail-ops.h | 8
mail/mail-send-recv.c | 2
mail/mail-vfolder.c | 4
mail/message-list.c | 4
plugins/exchange-operations/exchange-folder.c | 2
plugins/folder-unsubscribe/folder-unsubscribe.c | 2
plugins/groupwise-features/share-folder-common.c | 2
plugins/mailing-list-actions/mailing-list-actions.c | 2
plugins/mark-all-read/mark-all-read.c | 2
plugins/save-attachments/save-attachments.c | 2
30 files changed, 290 insertions(+), 432 deletions(-)
Index: evolution-2.8.1-ethread.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.8.1-ethread.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.8.1-ethread.patch 16 Oct 2006 19:21:38 -0000 1.1
+++ evolution-2.8.1-ethread.patch 17 Oct 2006 02:35:05 -0000 1.2
@@ -1,5 +1,5 @@
---- evolution-2.8.1/mail/mail-component.c.ethread 2006-09-04 06:44:18.000000000 -0400
-+++ evolution-2.8.1/mail/mail-component.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/mail-component.c.ethread 2006-09-04 06:36:49.000000000 -0400
++++ evolution-2.9.1/mail/mail-component.c 2006-10-16 21:22:35.000000000 -0400
@@ -964,7 +964,7 @@
if (camel_url_get_param(url, "uid") != NULL) {
char *curi = em_uri_to_camel(uri);
@@ -9,8 +9,8 @@
g_free(curi);
} else {
g_warning("email uri's must include a uid parameter");
---- evolution-2.8.1/mail/mail-folder-cache.c.ethread 2006-08-07 00:47:44.000000000 -0400
-+++ evolution-2.8.1/mail/mail-folder-cache.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/mail-folder-cache.c.ethread 2006-07-26 09:19:18.000000000 -0400
++++ evolution-2.9.1/mail/mail-folder-cache.c 2006-10-16 21:22:35.000000000 -0400
@@ -907,7 +907,7 @@
m->store = store;
camel_object_ref (store);
@@ -20,8 +20,8 @@
}
static gboolean
---- evolution-2.8.1/mail/em-folder-tree.c.ethread 2006-08-07 14:52:47.000000000 -0400
-+++ evolution-2.8.1/mail/em-folder-tree.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/em-folder-tree.c.ethread 2006-08-07 14:55:02.000000000 -0400
++++ evolution-2.9.1/mail/em-folder-tree.c 2006-10-16 21:22:35.000000000 -0400
@@ -966,7 +966,7 @@
tree_drag_data_action(struct _DragDataReceivedAsync *m)
{
@@ -40,8 +40,8 @@
}
static gboolean
---- evolution-2.8.1/mail/em-composer-utils.c.ethread 2006-04-22 00:39:21.000000000 -0400
-+++ evolution-2.8.1/mail/em-composer-utils.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/em-composer-utils.c.ethread 2006-04-18 16:56:36.000000000 -0400
++++ evolution-2.9.1/mail/em-composer-utils.c 2006-10-16 21:22:35.000000000 -0400
@@ -534,7 +534,7 @@
strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) {
int id;
@@ -85,8 +85,8 @@
- mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new);
+ mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push);
}
---- evolution-2.8.1/mail/em-folder-properties.c.ethread 2006-02-23 08:26:41.000000000 -0500
-+++ evolution-2.8.1/mail/em-folder-properties.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/em-folder-properties.c.ethread 2006-02-23 08:26:41.000000000 -0500
++++ evolution-2.9.1/mail/em-folder-properties.c 2006-10-16 21:22:35.000000000 -0400
@@ -379,7 +379,7 @@
}
@@ -96,8 +96,8 @@
else
emfp_dialog_got_folder((char *)uri, folder, NULL);
}
---- evolution-2.8.1/mail/importers/mail-importer.c.ethread 2006-02-08 06:51:32.000000000 -0500
-+++ evolution-2.8.1/mail/importers/mail-importer.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/importers/mail-importer.c.ethread 2006-02-08 06:51:32.000000000 -0500
++++ evolution-2.9.1/mail/importers/mail-importer.c 2006-10-16 21:22:35.000000000 -0400
@@ -329,7 +329,7 @@
}
@@ -107,8 +107,8 @@
return id;
}
---- evolution-2.8.1/mail/importers/pine-importer.c.ethread 2006-02-05 18:46:26.000000000 -0500
-+++ evolution-2.8.1/mail/importers/pine-importer.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/importers/pine-importer.c.ethread 2006-02-05 18:46:26.000000000 -0500
++++ evolution-2.9.1/mail/importers/pine-importer.c 2006-10-16 21:22:35.000000000 -0400
@@ -350,7 +350,7 @@
id = m->msg.seq;
@@ -118,8 +118,8 @@
return id;
}
---- evolution-2.8.1/mail/importers/elm-importer.c.ethread 2005-12-17 13:35:37.000000000 -0500
-+++ evolution-2.8.1/mail/importers/elm-importer.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/importers/elm-importer.c.ethread 2005-12-17 13:35:37.000000000 -0500
++++ evolution-2.9.1/mail/importers/elm-importer.c 2006-10-16 21:22:35.000000000 -0400
@@ -312,7 +312,7 @@
id = m->msg.seq;
@@ -129,8 +129,8 @@
return id;
}
---- evolution-2.8.1/mail/em-format-html-print.c.ethread 2005-05-19 02:46:23.000000000 -0400
-+++ evolution-2.8.1/mail/em-format-html-print.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/em-format-html-print.c.ethread 2005-05-19 02:46:23.000000000 -0400
++++ evolution-2.9.1/mail/em-format-html-print.c 2006-10-16 21:22:35.000000000 -0400
@@ -228,7 +228,7 @@
g_object_ref(source);
g_object_ref(efhp);
@@ -140,8 +140,8 @@
return 0; /* damn async ... */
}
---- evolution-2.8.1/mail/em-format-html.c.ethread 2006-10-16 00:17:07.000000000 -0400
-+++ evolution-2.8.1/mail/em-format-html.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/em-format-html.c.ethread 2006-10-16 21:22:35.000000000 -0400
++++ evolution-2.9.1/mail/em-format-html.c 2006-10-16 21:22:35.000000000 -0400
@@ -1374,7 +1374,7 @@
}
@@ -151,8 +151,8 @@
}
efh->priv->format_timeout_id = 0;
---- evolution-2.8.1/mail/em-folder-utils.c.ethread 2006-02-08 06:51:32.000000000 -0500
-+++ evolution-2.8.1/mail/em-folder-utils.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/em-folder-utils.c.ethread 2006-02-08 06:51:32.000000000 -0500
++++ evolution-2.9.1/mail/em-folder-utils.c 2006-10-16 21:22:35.000000000 -0400
@@ -260,7 +260,7 @@
m->delete = delete;
seq = m->msg.seq;
@@ -171,8 +171,8 @@
return id;
}
---- evolution-2.8.1/mail/em-folder-browser.c.ethread 2006-10-16 00:17:06.000000000 -0400
-+++ evolution-2.8.1/mail/em-folder-browser.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/em-folder-browser.c.ethread 2006-10-16 21:22:35.000000000 -0400
++++ evolution-2.9.1/mail/em-folder-browser.c 2006-10-16 21:22:35.000000000 -0400
@@ -950,7 +950,7 @@
m->sources_folder = sources_folder;
@@ -182,8 +182,8 @@
return id;
}
---- evolution-2.8.1/mail/mail-mt.c.ethread 2006-04-22 00:39:21.000000000 -0400
-+++ evolution-2.8.1/mail/mail-mt.c 2006-10-16 10:12:57.000000000 -0400
+--- evolution-2.9.1/mail/mail-mt.c.ethread 2006-10-16 10:37:09.000000000 -0400
++++ evolution-2.9.1/mail/mail-mt.c 2006-10-16 21:23:48.000000000 -0400
@@ -86,8 +86,6 @@
MailAsyncEvent *mail_async_event;
@@ -193,25 +193,36 @@
void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size)
{
struct _mail_msg *msg;
-@@ -432,11 +430,6 @@
+@@ -432,23 +430,6 @@
EMsgPort *mail_gui_reply_port;
static GIOChannel *mail_gui_reply_channel;
-/* a couple of global threads available */
+-#ifdef G_OS_WIN32
+-#undef mail_thread_queued
+-static
+-#endif
-EThread *mail_thread_queued; /* for operations that can (or should) be queued */
-EThread *mail_thread_queued_slow; /* for operations that can (or should) be queued, but take a long time */
-EThread *mail_thread_new; /* for operations that should run in a new thread each time */
-
+-#ifdef G_OS_WIN32
+-EThread *
+-mail_win32_get_mail_thread_queued (void)
+-{
+- return mail_thread_queued;
+-}
+-#endif
+-
static gboolean
mail_msgport_replied(GIOChannel *source, GIOCondition cond, void *d)
{
-@@ -522,73 +515,37 @@
+@@ -534,73 +515,37 @@
static void
-mail_msg_destroy(EThread *e, EMsg *msg, void *data)
-+mail_msg_proxy (mail_msg_t *msg)
- {
+-{
- mail_msg_t *m = (mail_msg_t *)msg;
-
-#ifdef MALLOC_CHECK
@@ -225,7 +236,8 @@
-
-static void
-mail_msg_received(EThread *e, EMsg *msg, void *data)
--{
++mail_msg_proxy (mail_msg_t *msg)
+ {
- mail_msg_t *m = (mail_msg_t *)msg;
-
-#ifdef MALLOC_CHECK
@@ -301,7 +313,7 @@
g_io_channel_unref(mail_gui_channel);
g_io_channel_unref(mail_gui_reply_channel);
-@@ -623,28 +580,52 @@
+@@ -635,28 +580,52 @@
mail_gui_watch = em_channel_setup(&mail_gui_port, &mail_gui_channel, mail_msgport_received);
mail_gui_watch2 = em_channel_setup(&mail_gui_port2, &mail_gui_channel2, mail_msgport_received2);
@@ -370,7 +382,7 @@
/* ********************************************************************** */
/* locks */
-@@ -736,7 +717,7 @@
+@@ -748,7 +717,7 @@
else
e_msgport_put(mail_gui_port, (EMsg *)m);
} else
@@ -379,8 +391,8 @@
return id;
}
---- evolution-2.8.1/mail/mail-ops.c.ethread 2006-10-16 00:17:07.000000000 -0400
-+++ evolution-2.8.1/mail/mail-ops.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/mail-ops.c.ethread 2006-10-16 21:22:35.000000000 -0400
++++ evolution-2.9.1/mail/mail-ops.c 2006-10-16 21:22:35.000000000 -0400
@@ -221,7 +221,7 @@
camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification");
}
@@ -606,8 +618,8 @@
return id;
}
---- evolution-2.8.1/mail/mail-send-recv.c.ethread 2006-10-16 00:17:07.000000000 -0400
-+++ evolution-2.8.1/mail/mail-send-recv.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/mail-send-recv.c.ethread 2006-10-16 21:22:35.000000000 -0400
++++ evolution-2.9.1/mail/mail-send-recv.c 2006-10-16 21:22:35.000000000 -0400
@@ -817,7 +817,7 @@
m->folders = folders;
m->info = sinfo;
@@ -617,8 +629,8 @@
} else {
receive_done ("", data);
}
---- evolution-2.8.1/mail/mail-mt.h.ethread 2004-12-02 22:38:03.000000000 -0500
-+++ evolution-2.8.1/mail/mail-mt.h 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/mail-mt.h.ethread 2006-10-16 10:37:09.000000000 -0400
++++ evolution-2.9.1/mail/mail-mt.h 2006-10-16 21:24:23.000000000 -0400
@@ -60,6 +60,13 @@
void mail_msg_wait_all(void);
int mail_msg_active(unsigned int msgid);
@@ -633,20 +645,25 @@
/* To implement the stop button */
void *mail_cancel_hook_add(GDestroyNotify func, void *data);
void mail_cancel_hook_remove(void *handle);
-@@ -117,11 +124,6 @@
+@@ -117,16 +124,6 @@
/* a message port that receives messages in the gui thread, used for the reply port */
extern EMsgPort *mail_gui_reply_port;
-/* some globally available threads */
+-#ifndef G_OS_WIN32
-extern EThread *mail_thread_queued; /* for operations that can (or should) be queued */
+-#else
+-EThread *mail_win32_get_mail_thread_queued (void);
+-#define mail_thread_queued mail_win32_get_mail_thread_queued ()
+-#endif
-extern EThread *mail_thread_new; /* for operations that should run in a new thread each time */
-extern EThread *mail_thread_queued_slow; /* for operations that can (or should) be queued, but take a long time */
-
/* The main thread. */
extern pthread_t mail_gui_thread;
---- evolution-2.8.1/mail/mail-vfolder.c.ethread 2006-07-03 23:54:58.000000000 -0400
-+++ evolution-2.8.1/mail/mail-vfolder.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/mail-vfolder.c.ethread 2006-06-30 05:46:26.000000000 -0400
++++ evolution-2.9.1/mail/mail-vfolder.c 2006-10-16 21:22:35.000000000 -0400
@@ -188,7 +188,7 @@
m->sources_folder = sources_folder;
@@ -665,8 +682,8 @@
return id;
}
---- evolution-2.8.1/mail/em-folder-view.c.ethread 2006-10-16 00:17:07.000000000 -0400
-+++ evolution-2.8.1/mail/em-folder-view.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/em-folder-view.c.ethread 2006-10-16 21:22:35.000000000 -0400
++++ evolution-2.9.1/mail/em-folder-view.c 2006-10-16 21:22:35.000000000 -0400
@@ -693,7 +693,7 @@
static void
emfv_set_folder_uri(EMFolderView *emfv, const char *uri)
@@ -703,8 +720,8 @@
} else {
e_profile_event_emit("goto.empty", "", 0);
g_free(emfv->priv->selected_uid);
---- evolution-2.8.1/mail/message-list.c.ethread 2006-10-16 00:17:07.000000000 -0400
-+++ evolution-2.8.1/mail/message-list.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/message-list.c.ethread 2006-10-16 21:22:35.000000000 -0400
++++ evolution-2.9.1/mail/message-list.c 2006-10-16 21:22:35.000000000 -0400
@@ -1885,7 +1885,7 @@
ml_drop_action(struct _drop_msg *m)
{
@@ -723,8 +740,8 @@
m->ml->regen_timeout_msg = NULL;
m->ml->regen_timeout_id = 0;
---- evolution-2.8.1/mail/mail-ops.h.ethread 2006-02-20 11:01:01.000000000 -0500
-+++ evolution-2.8.1/mail/mail-ops.h 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/mail-ops.h.ethread 2006-02-20 11:01:01.000000000 -0500
++++ evolution-2.9.1/mail/mail-ops.h 2006-10-16 21:22:35.000000000 -0400
@@ -30,6 +30,8 @@
#pragma }
#endif /* __cplusplus */
@@ -758,8 +775,8 @@
/* and for a store */
int mail_get_store (const char *uri, CamelOperation *op,
---- evolution-2.8.1/mail/em-subscribe-editor.c.ethread 2006-07-24 09:15:20.000000000 -0400
-+++ evolution-2.8.1/mail/em-subscribe-editor.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/mail/em-subscribe-editor.c.ethread 2006-07-24 05:01:30.000000000 -0400
++++ evolution-2.9.1/mail/em-subscribe-editor.c 2006-10-16 21:22:35.000000000 -0400
@@ -229,7 +229,7 @@
next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe);
if (next) {
@@ -787,8 +804,8 @@
return id;
}
---- evolution-2.8.1/plugins/folder-unsubscribe/folder-unsubscribe.c.ethread 2004-10-22 15:32:26.000000000 -0400
-+++ evolution-2.8.1/plugins/folder-unsubscribe/folder-unsubscribe.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/plugins/folder-unsubscribe/folder-unsubscribe.c.ethread 2004-10-22 15:32:26.000000000 -0400
++++ evolution-2.9.1/plugins/folder-unsubscribe/folder-unsubscribe.c 2006-10-16 21:22:35.000000000 -0400
@@ -108,5 +108,5 @@
unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t));
unsub->uri = g_strdup (target->uri);
@@ -796,8 +813,8 @@
- e_thread_put (mail_thread_new, (EMsg *) unsub);
+ mail_msg_unordered_push ((mail_msg_t *) unsub);
}
---- evolution-2.8.1/plugins/mark-all-read/mark-all-read.c.ethread 2005-05-19 13:32:41.000000000 -0400
-+++ evolution-2.8.1/plugins/mark-all-read/mark-all-read.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/plugins/mark-all-read/mark-all-read.c.ethread 2005-05-19 13:32:41.000000000 -0400
++++ evolution-2.9.1/plugins/mark-all-read/mark-all-read.c 2006-10-16 21:22:35.000000000 -0400
@@ -44,7 +44,7 @@
return;
}
@@ -807,8 +824,8 @@
}
static void
---- evolution-2.8.1/plugins/exchange-operations/exchange-folder.c.ethread 2006-06-14 00:56:26.000000000 -0400
-+++ evolution-2.8.1/plugins/exchange-operations/exchange-folder.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/plugins/exchange-operations/exchange-folder.c.ethread 2006-06-13 06:15:40.000000000 -0400
++++ evolution-2.9.1/plugins/exchange-operations/exchange-folder.c 2006-10-16 21:22:35.000000000 -0400
@@ -134,7 +134,7 @@
inbox_physical_uri = e_folder_get_physical_uri (inbox);
@@ -818,8 +835,8 @@
}
---- evolution-2.8.1/plugins/save-attachments/save-attachments.c.ethread 2006-07-09 23:54:05.000000000 -0400
-+++ evolution-2.8.1/plugins/save-attachments/save-attachments.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/plugins/save-attachments/save-attachments.c.ethread 2006-07-07 19:48:24.000000000 -0400
++++ evolution-2.9.1/plugins/save-attachments/save-attachments.c 2006-10-16 21:22:35.000000000 -0400
@@ -407,5 +407,5 @@
camel_object_ref(data->folder);
data->uid = g_strdup(target->uids->pdata[0]);
@@ -827,8 +844,8 @@
- mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new);
+ mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push);
}
---- evolution-2.8.1/plugins/mailing-list-actions/mailing-list-actions.c.ethread 2006-09-02 02:43:29.000000000 -0400
-+++ evolution-2.8.1/plugins/mailing-list-actions/mailing-list-actions.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/plugins/mailing-list-actions/mailing-list-actions.c.ethread 2006-08-23 04:38:52.000000000 -0400
++++ evolution-2.9.1/plugins/mailing-list-actions/mailing-list-actions.c 2006-10-16 21:22:35.000000000 -0400
@@ -89,7 +89,7 @@
data->uri = strdup (sel->uri);
@@ -838,8 +855,8 @@
}
void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data)
---- evolution-2.8.1/plugins/groupwise-features/share-folder-common.c.ethread 2006-02-08 06:08:24.000000000 -0500
-+++ evolution-2.8.1/plugins/groupwise-features/share-folder-common.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/plugins/groupwise-features/share-folder-common.c.ethread 2006-02-08 06:08:24.000000000 -0500
++++ evolution-2.9.1/plugins/groupwise-features/share-folder-common.c 2006-10-16 21:22:35.000000000 -0400
@@ -239,7 +239,7 @@
m->done = done;
g_free (namebuf);
@@ -849,8 +866,8 @@
return id;
}
---- evolution-2.8.1/calendar/gui/alarm-notify/alarm-queue.c.ethread 2006-09-02 02:41:31.000000000 -0400
-+++ evolution-2.8.1/calendar/gui/alarm-notify/alarm-queue.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/calendar/gui/alarm-notify/alarm-queue.c.ethread 2006-08-30 10:36:04.000000000 -0400
++++ evolution-2.9.1/calendar/gui/alarm-notify/alarm-queue.c 2006-10-16 21:22:35.000000000 -0400
@@ -115,9 +115,6 @@
static int tray_blink_state = FALSE;
static AlarmNotify *an;
@@ -1443,8 +1460,8 @@
}
/* Update non-time related variables for various structures on modification of an existing component
---- evolution-2.8.1/calendar/gui/alarm-notify/alarm-notify.c.ethread 2006-09-02 02:41:31.000000000 -0400
-+++ evolution-2.8.1/calendar/gui/alarm-notify/alarm-notify.c 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/calendar/gui/alarm-notify/alarm-notify.c.ethread 2006-08-24 09:53:20.000000000 -0400
++++ evolution-2.9.1/calendar/gui/alarm-notify/alarm-notify.c 2006-10-16 21:22:35.000000000 -0400
@@ -45,10 +45,6 @@
GMutex *mutex;
};
@@ -1557,8 +1574,8 @@
}
static void
---- evolution-2.8.1/calendar/gui/alarm-notify/alarm-notify.h.ethread 2006-04-22 00:39:20.000000000 -0400
-+++ evolution-2.8.1/calendar/gui/alarm-notify/alarm-notify.h 2006-10-16 00:17:07.000000000 -0400
+--- evolution-2.9.1/calendar/gui/alarm-notify/alarm-notify.h.ethread 2006-04-21 15:38:16.000000000 -0400
++++ evolution-2.9.1/calendar/gui/alarm-notify/alarm-notify.h 2006-10-16 21:22:35.000000000 -0400
@@ -39,19 +39,6 @@
typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate;
Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- evolution.spec 16 Oct 2006 20:57:35 -0000 1.199
+++ evolution.spec 17 Oct 2006 02:35:05 -0000 1.200
@@ -1,7 +1,7 @@
%define bug_buddy_version 2.15.90
%define dbus_glib_version 0.70
%define dbus_version 0.90
-%define eds_version 1.8.0
+%define eds_version 1.9.1
%define gnome_icon_theme_version 1.3.6
%define gnome_pilot_version 2.0.13
%define gnomevfs2_version 2.4
@@ -14,7 +14,7 @@
%define redhat_menus_version 5.0.4
%define soup_version 2.2.2
-%define evo_major 2.8
+%define evo_major 2.10
%define exchange_support 1
%define inline_audio_support 0
@@ -42,8 +42,8 @@
### Abstract ###
Name: evolution
-Version: 2.8.1
-Release: 4%{?dist}
+Version: 2.9.1
+Release: 1%{?dist}
License: GPL
Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite
@@ -118,9 +118,6 @@
# RH bug #202751 / Gnome.org bug #355766
Patch30: evolution-2.8.0-fix-indic-printing.patch
-# Gnome.org bug #359236
-Patch31: evolution-2.8.1-fix-search-state-crash.patch
-
# Gnome.org bug #360240
Patch32: evolution-2.8.1-warn-unused-variable.patch
@@ -265,7 +262,6 @@
%patch28 -p1 -b .deprecated-gdk-font
%patch29 -p1 -b .more-deprecated
%patch30 -p1 -b .fix-indic-printing
-%patch31 -p1 -b .fix-search-state-crash
%patch32 -p1 -b .warn-unused-variable
%patch33 -p1 -b .warn-incompatible-pointer-type
%patch34 -p1 -b .about-dialog
@@ -390,10 +386,15 @@
# scrollkeeper gets handled in %post
rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
-# evolution is the preferred email app
-for desktopfile in $RPM_BUILD_ROOT%{_datadir}/desktop-menu-patches/*-evolution-*.desktop; do
- ln -sf $desktopfile $RPM_BUILD_ROOT%{_datadir}/applications/
-done
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-mail.desktop \
+ $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-mail.desktop
+ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-calendar.desktop \
+ $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-calendar.desktop
+ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-contacts.desktop \
+ $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-contacts.desktop
+ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-tasks.desktop \
+ $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-tasks.desktop
# remove upstream desktop file; use the symlinks from above (#103826)
rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop
@@ -664,6 +665,11 @@
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
+* Mon Oct 16 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.1-1.fc7
+- Update to 2.9.1
+- Bump eds_version to 1.9.1, evo_major to 2.10.
+- Remove patch for Gnome.org bug #359236 (fixed upstream).
+
* Mon Oct 16 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.1-4.fc7
- Another typo.
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources 16 Oct 2006 19:21:38 -0000 1.58
+++ sources 17 Oct 2006 02:35:05 -0000 1.59
@@ -1 +1 @@
-6a08d1121bc126c4ed7035ab94a09871 evolution-2.8.1.tar.bz2
+e7e6492d80a7405bd34568fc78074cbe evolution-2.9.1.tar.bz2
--- evolution-2.8.1-fix-search-state-crash.patch DELETED ---
More information about the fedora-cvs-commits
mailing list