rpms/evolution/devel evolution-2.21.4-too-noisy.patch, NONE, 1.1 evolution-2.8.1-kill-ethread.patch, 1.18, 1.19 evolution.spec, 1.312, 1.313 evolution-2.10.0-e-passwords.patch, 1.1, NONE evolution-2.4.1-hide-switcher-buttons-by-default.patch, 1.2, NONE evolution-2.9.3-view-attachment-uri.patch, 1.1, NONE

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19811

Modified Files:
	evolution-2.8.1-kill-ethread.patch evolution.spec 
Added Files:
	evolution-2.21.4-too-noisy.patch 
Removed Files:
	evolution-2.10.0-e-passwords.patch 
	evolution-2.4.1-hide-switcher-buttons-by-default.patch 
	evolution-2.9.3-view-attachment-uri.patch 
Log Message:

* Mon Dec 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.21.4-1.fc9
- Update to 2.21.4
- Expunge unused patches.
- Bump eds_version to 2.21.4 for new Camel functions.


evolution-2.21.4-too-noisy.patch:

--- NEW FILE evolution-2.21.4-too-noisy.patch ---
diff -up evolution-2.21.4/plugins/mail-notification/mail-notification.c.too-noisy evolution-2.21.4/plugins/mail-notification/mail-notification.c
--- evolution-2.21.4/plugins/mail-notification/mail-notification.c.too-noisy	2007-12-15 10:58:55.000000000 -0500
+++ evolution-2.21.4/plugins/mail-notification/mail-notification.c	2007-12-17 12:41:26.000000000 -0500
@@ -581,7 +581,7 @@ static void
 new_notify_sound (EMEventTargetFolder *t)
 {
 	time_t last_newmail;
-	struct _SoundNotifyData data = {0, 0};
+	static struct _SoundNotifyData data = {0, 0};
 
 	time (&last_newmail);
 

evolution-2.8.1-kill-ethread.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.18 -r 1.19 evolution-2.8.1-kill-ethread.patch
Index: evolution-2.8.1-kill-ethread.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.8.1-kill-ethread.patch,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- evolution-2.8.1-kill-ethread.patch	4 Dec 2007 01:22:06 -0000	1.18
+++ evolution-2.8.1-kill-ethread.patch	17 Dec 2007 20:02:57 -0000	1.19
@@ -1,18 +1,18 @@
-diff -up evolution-2.21.1/mail/mail-send-recv.c.kill-ethread evolution-2.21.1/mail/mail-send-recv.c
---- evolution-2.21.1/mail/mail-send-recv.c.kill-ethread	2007-10-23 06:06:27.000000000 -0400
-+++ evolution-2.21.1/mail/mail-send-recv.c	2007-10-29 14:47:20.000000000 -0400
-@@ -775,23 +775,22 @@ receive_get_folder(CamelFilterDriver *d,
+diff -up evolution-2.21.4/mail/mail-send-recv.c.kill-ethread evolution-2.21.4/mail/mail-send-recv.c
+--- evolution-2.21.4/mail/mail-send-recv.c.kill-ethread	2007-12-16 14:30:32.000000000 -0500
++++ evolution-2.21.4/mail/mail-send-recv.c	2007-12-17 12:33:07.000000000 -0500
+@@ -779,23 +779,22 @@ receive_get_folder(CamelFilterDriver *d,
  /* ********************************************************************** */
-
+ 
  struct _refresh_folders_msg {
 -	struct _mail_msg msg;
 +	MailMsg base;
-
+ 
  	struct _send_info *info;
  	GPtrArray *folders;
  	CamelStore *store;
  };
-
+ 
 -static char *
 -refresh_folders_desc (struct _mail_msg *mm, int done)
 +static gchar *
@@ -20,7 +20,7 @@
  {
  	return g_strdup_printf(_("Checking for new mail"));
  }
-
+ 
  static void
 -refresh_folders_get (struct _mail_msg *mm)
 +refresh_folders_exec (struct _refresh_folders_msg *m)
@@ -29,9 +29,9 @@
  	int i;
  	CamelFolder *folder;
  	CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-@@ -813,17 +812,14 @@ refresh_folders_get (struct _mail_msg *m
+@@ -817,17 +816,14 @@ refresh_folders_get (struct _mail_msg *m
  }
-
+ 
  static void
 -refresh_folders_got (struct _mail_msg *mm)
 +refresh_folders_done (struct _refresh_folders_msg *m)
@@ -40,19 +40,19 @@
 -
  	receive_done("", m->info);
  }
-
+ 
  static void
 -refresh_folders_free (struct _mail_msg *mm)
 +refresh_folders_free (struct _refresh_folders_msg *m)
  {
 -	struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm;
  	int i;
-
+ 
  	for (i=0;i<m->folders->len;i++)
-@@ -832,11 +828,12 @@ refresh_folders_free (struct _mail_msg *
+@@ -836,11 +832,12 @@ refresh_folders_free (struct _mail_msg *
  	camel_object_unref(m->store);
  }
-
+ 
 -static struct _mail_msg_op refresh_folders_op = {
 -	refresh_folders_desc,
 -	refresh_folders_get,
@@ -65,52 +65,52 @@
 +	(MailMsgDoneFunc) refresh_folders_done,
 +	(MailMsgFreeFunc) refresh_folders_free
  };
-
+ 
  static void
-@@ -869,13 +866,13 @@ receive_update_got_folderinfo(CamelStore
-
+@@ -870,13 +867,13 @@ receive_update_got_folderinfo(CamelStore
+ 
  		get_folders(store, folders, info);
-
+ 
 -		m = mail_msg_new(&refresh_folders_op, NULL, sizeof(*m));
 +		m = mail_msg_new(&refresh_folders_info);
  		m->store = store;
  		camel_object_ref(store);
  		m->folders = folders;
  		m->info = sinfo;
-
+ 
 -		e_thread_put(mail_thread_new, (EMsg *)m);
 +		mail_msg_unordered_push (m);
  	} else {
  		receive_done ("", data);
  	}
-diff -up evolution-2.21.1/mail/mail-component.c.kill-ethread evolution-2.21.1/mail/mail-component.c
---- evolution-2.21.1/mail/mail-component.c.kill-ethread	2007-10-23 06:06:27.000000000 -0400
-+++ evolution-2.21.1/mail/mail-component.c	2007-10-29 14:47:20.000000000 -0400
-@@ -1000,7 +1000,7 @@ impl_handleURI (PortableServer_Servant s
+diff -up evolution-2.21.4/mail/mail-component.c.kill-ethread evolution-2.21.4/mail/mail-component.c
+--- evolution-2.21.4/mail/mail-component.c.kill-ethread	2007-12-16 15:05:36.000000000 -0500
++++ evolution-2.21.4/mail/mail-component.c	2007-12-17 12:33:08.000000000 -0500
+@@ -1010,7 +1010,7 @@ impl_handleURI (PortableServer_Servant s
  		if (camel_url_get_param(url, "uid") != NULL) {
  			char *curi = em_uri_to_camel(uri);
-
+ 
 -			mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new);
 +			mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push);
  			g_free(curi);
  		} else {
  			g_warning("email uri's must include a uid parameter");
-diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mail-ops.c
---- evolution-2.21.1/mail/mail-ops.c.kill-ethread	2007-10-23 06:06:27.000000000 -0400
-+++ evolution-2.21.1/mail/mail-ops.c	2007-10-29 14:54:45.000000000 -0400
+diff -up evolution-2.21.4/mail/mail-ops.c.kill-ethread evolution-2.21.4/mail/mail-ops.c
+--- evolution-2.21.4/mail/mail-ops.c.kill-ethread	2007-12-16 14:36:47.000000000 -0500
++++ evolution-2.21.4/mail/mail-ops.c	2007-12-17 12:33:07.000000000 -0500
 @@ -75,7 +75,7 @@
  /* used for both just filtering a folder + uid's, and for filtering a whole folder */
  /* used both for fetching mail, and for filtering mail */
  struct _filter_mail_msg {
 -	struct _mail_msg msg;
 +	MailMsg base;
-
+ 
  	CamelFolder *source_folder; /* where they come from */
  	GPtrArray *source_uids;	/* uids to copy, or NULL == copy all */
 @@ -99,8 +99,8 @@ struct _fetch_mail_msg {
  	void *data;
  };
-
+ 
 -static char *
 -em_filter_folder_element_describe (struct _mail_msg *mm, int complete)
 +static gchar *
@@ -128,35 +128,35 @@
 -	struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm;
  	CamelFolder *folder;
  	GPtrArray *uids, *folder_uids = NULL;
-
-@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct
+ 
+@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct 
  	else
  		folder_uids = uids = camel_folder_get_uids (folder);
-
+ 
 -	camel_filter_driver_filter_folder (m->driver, folder, m->cache, uids, m->delete, &mm->ex);
 -	camel_filter_driver_flush (m->driver, &mm->ex);
 +	camel_filter_driver_filter_folder (m->driver, folder, m->cache, uids, m->delete, &m->base.ex);
 +	camel_filter_driver_flush (m->driver, &m->base.ex);
-
+ 
  	if (folder_uids)
  		camel_folder_free_uids (folder, folder_uids);
-
+ 
  	/* sync our source folder */
  	if (!m->cache)
 -		camel_folder_sync (folder, FALSE, camel_exception_is_set (&mm->ex) ? NULL : &mm->ex);
 +		camel_folder_sync (folder, FALSE, camel_exception_is_set (&m->base.ex) ? NULL : &m->base.ex);
  	camel_folder_thaw (folder);
-
+ 
  	if (m->destination)
-@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct
+@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct 
  }
-
+ 
  static void
 -em_filter_folder_element_filtered (struct _mail_msg *mm)
 +em_filter_folder_element_done (struct _filter_mail_msg *m)
  {
  }
-
+ 
  static void
 -em_filter_folder_element_free (struct _mail_msg *mm)
 +em_filter_folder_element_free (struct _filter_mail_msg *m)
@@ -165,11 +165,11 @@
 -
  	if (m->source_folder)
  		camel_object_unref (m->source_folder);
-
+ 
 @@ -188,11 +185,12 @@ em_filter_folder_element_free (struct _m
  	mail_session_flush_filter_log ();
[...6812 lines suppressed...]
-@@ -1417,29 +1419,24 @@ tray_icon_blink_cb (gpointer data)
+@@ -1417,29 +1419,23 @@ tray_icon_blink_cb (gpointer data)
  /* Add a new data to tray list */
-
+ 
  static void
 -tray_list_add_async (EThread *e, AlarmMsg *msg, void *data)
 +tray_list_add_async (struct _tray_msg *msg)
@@ -7171,19 +7196,18 @@
 -	struct _tray_msg *list = msg->data;
 -	d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data));
 -	tray_icons_list = g_list_prepend (tray_icons_list, list->data);
-+	d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, msg->data));
 +	tray_icons_list = g_list_prepend (tray_icons_list, msg->data);
 +
 +	g_slice_free (struct _tray_msg, msg);
  }
-
+ 
  static void
  tray_list_add_new (TrayIconData *data)
  {
 -	AlarmMsg *msg;
 -	struct _tray_msg *list;
 +	struct _tray_msg *msg;
-
+ 
 -	/* These two structures will be freed by the msg destroy function*/
 -	msg = malloc (sizeof (AlarmMsg));
 -	msg->receive_msg = tray_list_add_async;
@@ -7191,52 +7215,51 @@
 -	list = malloc (sizeof (struct _tray_msg));
 -	list->data = data;
 -	msg->data = list;
--
--	d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__));
--	e_thread_put(alarm_operation_thread, (EMsg *)msg);
 +	msg = g_slice_new (struct _tray_msg);
 +	msg->header.func = (MessageFunc) tray_list_add_async;
 +	msg->data = data;
-+
+ 
+-	d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__));
+-	e_thread_put(alarm_operation_thread, (EMsg *)msg);
 +	message_push ((Message *) msg);
  }
-
+ 
  /* Performs notification of a display alarm */
-@@ -1836,21 +1833,13 @@ check_midnight_refresh (gpointer user_da
+@@ -1836,21 +1832,13 @@ check_midnight_refresh (gpointer user_da
  	new_midnight = time_day_end_with_zone (time (NULL), zone);
-
+ 
  	if (new_midnight > midnight) {
 -		AlarmMsg *msg;
 -		struct _midnight_refresh_msg *list;
--
++		struct _midnight_refresh_msg *msg;
+ 
 -		/* These two structures will be freed by the msg destroy function*/
 -		msg = malloc (sizeof (AlarmMsg));
 -		msg->receive_msg = midnight_refresh_async;
--
++		msg = g_slice_new (struct _midnight_refresh_msg);
++		msg->header.func = (MessageFunc) midnight_refresh_async;
++		msg->remove = FALSE;
+ 
 -		list = malloc (sizeof (struct _midnight_refresh_msg));
-+		struct _midnight_refresh_msg *msg;
-
+-
 -		list->remove = FALSE;
 -		/* We dont need it. So set it to NULL */
 -		msg->data = list;
-+		msg = g_slice_new (struct _midnight_refresh_msg);
-+		msg->header.func = (MessageFunc) midnight_refresh_async;
-+		msg->remove = FALSE;
-
+-
 -		d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__));
 -		e_thread_put(alarm_operation_thread, (EMsg *)msg);
 +		message_push ((Message *) msg);
  	}
-
+ 
  	return TRUE;
-@@ -1981,14 +1970,15 @@ hash_ids (gpointer a)
+@@ -1981,14 +1969,15 @@ hash_ids (gpointer a)
  }
-
+ 
  struct _alarm_client_msg {
 +	Message header;
  	ECal *client;
  };
-
+ 
 -static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data)
 +static void
 +alarm_queue_add_async (struct _alarm_client_msg *msg)
@@ -7245,26 +7268,26 @@
 -	struct _alarm_client_msg *list = msg->data;
 -	ECal *client = list->client;
 +	ECal *client = msg->client;
-
+ 
  	g_return_if_fail (alarm_queue_inited);
  	g_return_if_fail (client != NULL);
-@@ -2019,6 +2009,8 @@ static void alarm_queue_add_async (EThre
+@@ -2019,6 +2008,8 @@ static void alarm_queue_add_async (EThre
  				  G_CALLBACK (cal_opened_cb),
  				  ca);
  	}
 +
 +	g_slice_free (struct _alarm_client_msg, msg);
  }
-
+ 
  /**
-@@ -2038,20 +2030,13 @@ static void alarm_queue_add_async (EThre
+@@ -2038,20 +2029,13 @@ static void alarm_queue_add_async (EThre
  void
  alarm_queue_add_client (ECal *client)
  {
 -	AlarmMsg *msg;
 -	struct _alarm_client_msg *list;
 +	struct _alarm_client_msg *msg;
-
+ 
 -	/* These two structures will be freed by the msg destroy function*/
 -	msg = malloc (sizeof (AlarmMsg));
 -	msg->receive_msg = alarm_queue_add_async;
@@ -7276,14 +7299,14 @@
 +	msg = g_slice_new (struct _alarm_client_msg);
 +	msg->header.func = (MessageFunc) alarm_queue_add_async;
 +	msg->client = g_object_ref (client);
-
+ 
 -	d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__));
 -	e_thread_put(alarm_operation_thread, (EMsg *)msg);
 +	message_push ((Message *) msg);
  }
-
+ 
  /* Removes a component an its alarms */
-@@ -2103,11 +2088,10 @@ remove_client_alarms (ClientAlarms *ca)
+@@ -2103,11 +2087,10 @@ remove_client_alarms (ClientAlarms *ca)
   * Removes a calendar client from the alarm queueing system.
   **/
  static void
@@ -7294,26 +7317,26 @@
 -	struct _alarm_client_msg *list = msg->data;
 -	ECal *client = list->client;
 +	ECal *client = msg->client;
-
+ 
  	g_return_if_fail (alarm_queue_inited);
  	g_return_if_fail (client != NULL);
-@@ -2144,6 +2128,8 @@ alarm_queue_remove_async (EThread *e, Al
+@@ -2144,6 +2127,8 @@ alarm_queue_remove_async (EThread *e, Al
  	g_free (ca);
-
+ 
  	g_hash_table_remove (client_alarms_hash, client);
 +
 +	g_slice_free (struct _alarm_client_msg, msg);
  }
-
+ 
  /** alarm_queue_remove_client
-@@ -2156,24 +2142,16 @@ alarm_queue_remove_async (EThread *e, Al
+@@ -2156,24 +2141,16 @@ alarm_queue_remove_async (EThread *e, Al
  void
  alarm_queue_remove_client (ECal *client, gboolean immediately)
  {
 -	AlarmMsg *msg;
 -	struct _alarm_client_msg *list;
 +	struct _alarm_client_msg *msg;
-
+ 
 -	/* These two structures will be freed by the msg destroy function*/
 -	msg = malloc (sizeof (AlarmMsg));
 -	msg->receive_msg = alarm_queue_remove_async;
@@ -7324,7 +7347,7 @@
 +	msg = g_slice_new (struct _alarm_client_msg);
 +	msg->header.func = (MessageFunc) alarm_queue_remove_async;
 +	msg->client = client;
-
+ 
 -	d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__));
  	if (immediately) {
 -		alarm_queue_remove_async (NULL, msg, NULL);
@@ -7335,5 +7358,5 @@
 -		e_thread_put(alarm_operation_thread, (EMsg *)msg);
 +		message_push ((Message *) msg);
  }
-
+ 
  /* Update non-time related variables for various structures on modification of an existing component


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -r1.312 -r1.313
--- evolution.spec	10 Dec 2007 20:16:51 -0000	1.312
+++ evolution.spec	17 Dec 2007 20:02:57 -0000	1.313
@@ -1,6 +1,6 @@
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
-%define eds_version 2.21.3
+%define eds_version 2.21.4
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.19.91
 %define gnome_pilot_version 2.0.15
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.21.3
-Release: 4%{?dist}
+Version: 2.21.4
+Release: 1%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -66,50 +66,42 @@
 # Fix for RH bug 164957 (was for 145552):
 Patch12: evolution-2.0.2-fix-145552.patch
 
-# Part of RH bug 170799:
-# XXX Revert this for Fedora 9
-#Patch13: evolution-2.4.1-hide-switcher-buttons-by-default.patch
-
 # Patches for conduits, based upon
 # rh-161817-attach-116019-conduit_pilot_link_updates.diff
 # (the latter patch was originally by Mark G. Adams):
-# Patch14: evolution-2.5.4-fix-conduits.patch
+# Patch13: evolution-2.5.4-fix-conduits.patch
 
 # Move .conduit files from share to lib (for the sake of multilib)
 # This patch effects other parts of evolution.spec and so is necessary
 # for a successful build.
-Patch15: evolution-2.5.4-fix-conduit-dir.patch
+Patch14: evolution-2.5.4-fix-conduit-dir.patch
 
 # Remove gnome-common macros from configure.in.
 # We do not ship gnome-common (or at least we're not supposed to).
-Patch16: evolution-2.7.1-no-gnome-common.patch
+Patch15: evolution-2.7.1-no-gnome-common.patch
 
-#Patch17: evolution-2.7.1-notification-cleanups.patch
+#Patch16: evolution-2.7.1-notification-cleanups.patch
 
 # RH bug #166231 / GNOME bug #264485
-Patch20: evolution-2.7.3-replicated-cjk-input.patch
+Patch17: evolution-2.7.3-replicated-cjk-input.patch
 
 # RH bug #178295 / GNOME bug #348638
-Patch21: evolution-2.7.4-deleting-preedit-buffer.patch
+Patch18: evolution-2.7.4-deleting-preedit-buffer.patch
 
 # GNOME bug #362638
-Patch25: evolution-2.8.1-kill-ethread.patch
+Patch19: evolution-2.8.1-kill-ethread.patch
 
 # GNOME bug #363695
-Patch26: evolution-2.9.1-kill-ememory.patch
+Patch20: evolution-2.9.1-kill-ememory.patch
 
 # RH bug #176400
-Patch27: evolution-2.9.1-im-context-reset.patch
-
-# RH bug #216537 / GNOME bug #383047
-#Patch29: evolution-2.9.3-view-attachment-uri.patch
+Patch21: evolution-2.9.1-im-context-reset.patch
 
 # RH bug #215478 / GNOME bug #383842
-Patch30: evolution-2.9.3-source-path-entry.patch
+Patch22: evolution-2.9.3-source-path-entry.patch
 
-# GNOME bug #376991
-# XXX Disabled due to outstanding issues.
-#Patch33: evolution-2.10.0-e-passwords.patch
+# GNOME bug #504030
+Patch23: evolution-2.21.4-too-noisy.patch
 
 ## Dependencies ###
 
@@ -249,19 +241,17 @@
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .commit-enter-on-calendar
 %patch12 -p1 -b .fix-164957
-#patch13 -p1 -b .hide-switcher-buttons-by-default
-#patch14 -p1 -b .fix-conduits  # leave commented
-%patch15 -p1 -b .fix-conduit-dir
-%patch16 -p1 -b .no-gnome-common
-#patch17 -p1 -b .notification-cleanups
-%patch20 -p1 -b .replicated-cjk-input
-%patch21 -p1 -b .deleting-preedit-buffer
-%patch25 -p1 -b .kill-ethread
-%patch26 -p1 -b .kill-ememory
-%patch27 -p1 -b .im-context-reset
-#%patch29 -p1 -b .view-attachment-uri
-%patch30 -p1 -b .source-path-entry
-#%patch33 -p1 -b .e-passwords
+#patch13 -p1 -b .fix-conduits  # leave commented
+%patch14 -p1 -b .fix-conduit-dir
+%patch15 -p1 -b .no-gnome-common
+#patch16 -p1 -b .notification-cleanups
+%patch17 -p1 -b .replicated-cjk-input
+%patch18 -p1 -b .deleting-preedit-buffer
+%patch19 -p1 -b .kill-ethread
+%patch20 -p1 -b .kill-ememory
+%patch21 -p1 -b .im-context-reset
+%patch22 -p1 -b .source-path-entry
+%patch23 -p1 -b .too-noisy
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -694,6 +684,11 @@
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Mon Dec 17 2007 Matthew Barnes <mbarnes at redhat.com> - 2.21.4-1.fc9
+- Update to 2.21.4
+- Expunge unused patches.
+- Bump eds_version to 2.21.4 for new Camel functions.
+
 * Mon Dec 10 2007 Matthew Barnes <mbarnes at redhat.com> - 2.21.3-4.fc9
 - Split junk filtering plugins into evolution-bogofilter and
   evolution-spamassassin subpackages, each of which requires the


--- evolution-2.10.0-e-passwords.patch DELETED ---


--- evolution-2.4.1-hide-switcher-buttons-by-default.patch DELETED ---


--- evolution-2.9.3-view-attachment-uri.patch DELETED ---