Remove unneeded patches.

- Remove patch to fix the giant "mail-mark-notjunk" icon (fixed upstream)
- Remove patch for RH bug #588004 (fixed upstream)
- Remove patch for RH bug #590373 (fixed upstream)
- Remove patch for GNOME bug #618400 (fixed upstream)
- Remove patch for GNOME bug #618902 (fixed upstream)

.cvsignore

@@ -1 +0,0 @@
-evolution-2.29.90.tar.bz2

.gitignore

@@ -0,0 +1,2 @@
+evolution-2.30.2.tar.bz2
+evolution-2.30.3.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: evolution
-# $Id: Makefile,v 1.2 2007/10/15 18:44:15 notting Exp $
-NAME := evolution
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

evolution-1.4.4-ldap-x86_64-hack.patch

@@ -1,12 +1,21 @@
-diff -up evolution-2.24.1/configure.ldaphack evolution-2.24.1/configure
---- evolution-2.24.1/configure.ldaphack	2008-10-19 23:37:55.000000000 -0400
-+++ evolution-2.24.1/configure	2008-10-21 13:16:16.000000000 -0400
-@@ -28471,7 +28471,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
+diff -up evolution-2.30.1/configure.ldaphack evolution-2.30.1/configure
+--- evolution-2.30.1/configure.ldaphack	2010-04-26 05:22:50.000000000 +0200
++++ evolution-2.30.1/configure	2010-04-26 09:52:22.000000000 +0200
+@@ -15791,7 +15791,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
 +LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -16123,7 +16123,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set}
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
++LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 

evolution-2.30.1-help-contents.patch

@@ -0,0 +1,18 @@
+diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evolution-2.30.1.2/shell/e-shell-window-actions.c
+--- evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents	2010-04-26 09:13:18.000000000 -0400
++++ evolution-2.30.1.2/shell/e-shell-window-actions.c	2010-05-07 21:29:06.269059830 -0400
+@@ -2001,6 +2001,14 @@ e_shell_window_actions_init (EShellWindo
+ 	if (path == NULL)
+ 		gtk_action_set_visible (ACTION (SYNC_OPTIONS), FALSE);
+ 	g_free (path);
++
++	/* Viewing user documentation requires the evolution-help
++	 * Fedora package.  Look for one of the files it installs. */
++	path = g_build_filename (
++		EVOLUTION_DATADIR, "omf", PACKAGE, "evolution-C.omf", NULL);
++	if (!g_file_test (path, G_FILE_TEST_IS_REGULAR))
++		gtk_action_set_visible (ACTION (CONTENTS), FALSE);
++	g_free (path);
+ }
+ 
+ static GList *

evolution-2.30.2-async-event-idle-cb.patch

@@ -0,0 +1,77 @@
+diff -up evolution-2.30.2/mail/mail-mt.c.async-event-idle-cb evolution-2.30.2/mail/mail-mt.c
+--- evolution-2.30.2/mail/mail-mt.c.async-event-idle-cb	2010-06-20 08:15:05.000000000 -0400
++++ evolution-2.30.2/mail/mail-mt.c	2010-06-24 11:18:16.718108542 -0400
+@@ -608,6 +608,7 @@ struct _proxy_msg {
+ 	mail_async_event_t type;
+ 
+ 	GThread *thread;
++	guint idle_id;
+ 
+ 	MailAsyncFunc func;
+ 	gpointer o;
+@@ -628,10 +629,11 @@ do_async_event(struct _proxy_msg *m)
+ }
+ 
+ static gint
+-idle_async_event(gpointer mm)
++idle_async_event (struct _proxy_msg *m)
+ {
+-	do_async_event(mm);
+-	mail_msg_unref(mm);
++	m->idle_id = 0;
++	do_async_event (m);
++	mail_msg_unref (m);
+ 
+ 	return FALSE;
+ }
+@@ -655,7 +657,7 @@ mail_async_event_new (void)
+ 	return ea;
+ }
+ 
+-gint
++guint
+ mail_async_event_emit (MailAsyncEvent *ea,
+                        mail_async_event_t type,
+                        MailAsyncFunc func,
+@@ -664,7 +666,7 @@ mail_async_event_emit (MailAsyncEvent *e
+                        gpointer data)
+ {
+ 	struct _proxy_msg *m;
+-	gint id;
++	guint id;
+ 
+ 	/* We dont have a reply port for this, we dont
+ 	 * care when/if it gets executed, just queue it. */
+@@ -687,7 +689,8 @@ mail_async_event_emit (MailAsyncEvent *e
+ 	 * overflow and deadlock us. */
+ 	if (type == MAIL_ASYNC_GUI) {
+ 		if (mail_in_main_thread ())
+-			g_idle_add(idle_async_event, m);
++			m->idle_id = g_idle_add (
++				(GSourceFunc) idle_async_event, m);
+ 		else
+ 			mail_msg_main_loop_push(m);
+ 	} else
+@@ -712,6 +715,10 @@ mail_async_event_destroy (MailAsyncEvent
+ 			errno = EDEADLK;
+ 			return -1;
+ 		}
++		if (m->idle_id > 0) {
++			g_source_remove (m->idle_id);
++			m->idle_id = 0;
++		}
+ 		g_mutex_unlock(ea->lock);
+ 		mail_msg_wait(id);
+ 		g_mutex_lock(ea->lock);
+diff -up evolution-2.30.2/mail/mail-mt.h.async-event-idle-cb evolution-2.30.2/mail/mail-mt.h
+--- evolution-2.30.2/mail/mail-mt.h.async-event-idle-cb	2010-06-20 08:15:04.000000000 -0400
++++ evolution-2.30.2/mail/mail-mt.h	2010-06-24 11:18:16.718108542 -0400
+@@ -102,7 +102,7 @@ typedef void (*MailAsyncFunc)(gpointer ,
+ /* create a new async event handler */
+ MailAsyncEvent *mail_async_event_new(void);
+ /* forward a camel event (or other call) to the gui thread */
+-gint mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsyncFunc func, gpointer , gpointer , gpointer );
++guint mail_async_event_emit(MailAsyncEvent *ea, mail_async_event_t type, MailAsyncFunc func, gpointer , gpointer , gpointer );
+ /* wait for all outstanding async events to complete */
+ gint mail_async_event_destroy(MailAsyncEvent *ea);
+ 

evolution-2.30.2-handle-startdate-uris.patch

@@ -0,0 +1,189 @@
+diff -up evolution-2.30.2/modules/calendar/e-cal-shell-backend.c.handle-startdate-uris evolution-2.30.2/modules/calendar/e-cal-shell-backend.c
+--- evolution-2.30.2/modules/calendar/e-cal-shell-backend.c.handle-startdate-uris	2010-06-20 08:14:46.000000000 -0400
++++ evolution-2.30.2/modules/calendar/e-cal-shell-backend.c	2010-06-24 13:26:43.866095974 -0400
+@@ -48,6 +48,7 @@
+ #include "e-cal-shell-content.h"
+ #include "e-cal-shell-migrate.h"
+ #include "e-cal-shell-settings.h"
++#include "e-cal-shell-sidebar.h"
+ #include "e-cal-shell-view.h"
+ 
+ #define E_CAL_SHELL_BACKEND_GET_PRIVATE(obj) \
+@@ -539,6 +540,8 @@ cal_shell_backend_handle_uri_cb (EShellB
+ 	gchar *source_uid = NULL;
+ 	gchar *comp_uid = NULL;
+ 	gchar *comp_rid = NULL;
++	GDate start_date;
++	GDate end_date;
+ 	gboolean handled = FALSE;
+ 	GError *error = NULL;
+ 
+@@ -553,6 +556,9 @@ cal_shell_backend_handle_uri_cb (EShellB
+ 	if (cp == NULL)
+ 		goto exit;
+ 
++	g_date_clear (&start_date, 1);
++	g_date_clear (&end_date, 1);
++
+ 	while (*cp != '\0') {
+ 		gchar *header;
+ 		gchar *content;
+@@ -572,7 +578,13 @@ cal_shell_backend_handle_uri_cb (EShellB
+ 		content_len = strcspn (cp, "&");
+ 
+ 		content = g_strndup (cp, content_len);
+-		if (g_ascii_strcasecmp (header, "source-uid") == 0)
++		if (g_ascii_strcasecmp (header, "startdate") == 0)
++			g_date_set_time_t (
++				&start_date, time_from_isodate (content));
++		else if (g_ascii_strcasecmp (header, "enddate") == 0)
++			g_date_set_time_t (
++				&end_date, time_from_isodate (content));
++		else if (g_ascii_strcasecmp (header, "source-uid") == 0)
+ 			source_uid = g_strdup (content);
+ 		else if (g_ascii_strcasecmp (header, "comp-uid") == 0)
+ 			comp_uid = g_strdup (content);
+@@ -588,6 +600,21 @@ cal_shell_backend_handle_uri_cb (EShellB
+ 		}
+ 	}
+ 
++	/* This is primarily for launching Evolution
++	 * from the calendar in the clock applet. */
++	if (g_date_valid (&start_date)) {
++		if (g_date_valid (&end_date))
++			e_cal_shell_backend_open_date_range (
++				E_CAL_SHELL_BACKEND (shell_backend),
++				&start_date, &end_date);
++		else
++			e_cal_shell_backend_open_date_range (
++				E_CAL_SHELL_BACKEND (shell_backend),
++				&start_date, NULL);
++		handled = TRUE;
++		goto exit;
++	}
++
+ 	if (source_uid == NULL || comp_uid == NULL)
+ 		goto exit;
+ 
+@@ -831,3 +858,57 @@ e_cal_shell_backend_get_source_list (ECa
+ 
+ 	return cal_shell_backend->priv->source_list;
+ }
++
++void
++e_cal_shell_backend_open_date_range (ECalShellBackend *cal_shell_backend,
++                                     const GDate *start_date,
++                                     const GDate *end_date)
++{
++	EShell *shell;
++	EShellView *shell_view;
++	EShellBackend *shell_backend;
++	EShellSidebar *shell_sidebar;
++	GtkWidget *shell_window = NULL;
++	ECalendar *navigator;
++	GList *watched_windows;
++
++	g_return_if_fail (E_IS_CAL_SHELL_BACKEND (cal_shell_backend));
++
++	shell_backend = E_SHELL_BACKEND (cal_shell_backend);
++	shell = e_shell_backend_get_shell (shell_backend);
++	watched_windows = e_shell_get_watched_windows (shell);
++
++	/* Try to find an EShellWindow already in calendar view. */
++	while (watched_windows != NULL) {
++		GtkWidget *window = GTK_WIDGET (watched_windows->data);
++
++		if (E_IS_SHELL_WINDOW (window)) {
++			const gchar *active_view;
++
++			active_view = e_shell_window_get_active_view (
++				E_SHELL_WINDOW (window));
++			if (g_strcmp0 (active_view, "calendar") == 0) {
++				gtk_window_present (GTK_WINDOW (window));
++				shell_window = window;
++				break;
++			}
++		}
++
++		watched_windows = g_list_next (watched_windows);
++	}
++
++	/* Otherwise create a new EShellWindow in calendar view. */
++	if (shell_window == NULL)
++		shell_window = e_shell_create_shell_window (shell, "calendar");
++
++	/* Now dig up the date navigator and select the date range. */
++
++	shell_view = e_shell_window_get_shell_view (
++		E_SHELL_WINDOW (shell_window), "calendar");
++	shell_sidebar = e_shell_view_get_shell_sidebar (shell_view);
++	navigator = e_cal_shell_sidebar_get_date_navigator (
++		E_CAL_SHELL_SIDEBAR (shell_sidebar));
++
++	e_calendar_item_set_selection (
++		navigator->calitem, start_date, end_date);
++}
+diff -up evolution-2.30.2/modules/calendar/e-cal-shell-backend.h.handle-startdate-uris evolution-2.30.2/modules/calendar/e-cal-shell-backend.h
+--- evolution-2.30.2/modules/calendar/e-cal-shell-backend.h.handle-startdate-uris	2010-06-20 08:14:47.000000000 -0400
++++ evolution-2.30.2/modules/calendar/e-cal-shell-backend.h	2010-06-24 13:26:43.867095475 -0400
+@@ -64,6 +64,10 @@ void		e_cal_shell_backend_register_type
+ 					(GTypeModule *type_module);
+ ESourceList *	e_cal_shell_backend_get_source_list
+ 					(ECalShellBackend *cal_shell_backend);
++void		e_cal_shell_backend_open_date_range
++					(ECalShellBackend *cal_shell_backend,
++					 const GDate *start_date,
++					 const GDate *end_date);
+ 
+ G_END_DECLS
+ 
+diff -up evolution-2.30.2/widgets/misc/e-calendar-item.c.handle-startdate-uris evolution-2.30.2/widgets/misc/e-calendar-item.c
+--- evolution-2.30.2/widgets/misc/e-calendar-item.c.handle-startdate-uris	2010-06-20 08:14:29.000000000 -0400
++++ evolution-2.30.2/widgets/misc/e-calendar-item.c	2010-06-24 13:26:43.871094945 -0400
+@@ -188,8 +188,8 @@ static void e_calendar_item_date_range_c
+ static void e_calendar_item_queue_signal_emission	(ECalendarItem	*calitem);
+ static gboolean e_calendar_item_signal_emission_idle_cb	(gpointer data);
+ static void e_calendar_item_set_selection_if_emission (ECalendarItem	*calitem,
+-						       GDate		*start_date,
+-						       GDate		*end_date,
++						       const GDate	*start_date,
++						       const GDate	*end_date,
+ 						       gboolean emission);
+ 
+ /* Our arguments. */
+@@ -3094,8 +3094,8 @@ e_calendar_item_get_selection		(ECalenda
+ 
+ static void
+ e_calendar_item_set_selection_if_emission (ECalendarItem	*calitem,
+-					   GDate		*start_date,
+-					   GDate		*end_date,
++					   const GDate		*start_date,
++					   const GDate		*end_date,
+ 					   gboolean emission)
+ {
+ 	gint start_year, start_month, start_day;
+@@ -3197,8 +3197,8 @@ e_calendar_item_style_set (GtkWidget *wi
+ 
+ void
+ e_calendar_item_set_selection (ECalendarItem	*calitem,
+-			       GDate		*start_date,
+-			       GDate		*end_date)
++			       const GDate	*start_date,
++			       const GDate	*end_date)
+ {
+ 	/* If the user is in the middle of a selection, we must abort it. */
+ 	if (calitem->selecting) {
+diff -up evolution-2.30.2/widgets/misc/e-calendar-item.h.handle-startdate-uris evolution-2.30.2/widgets/misc/e-calendar-item.h
+--- evolution-2.30.2/widgets/misc/e-calendar-item.h.handle-startdate-uris	2010-06-20 08:14:33.000000000 -0400
++++ evolution-2.30.2/widgets/misc/e-calendar-item.h	2010-06-24 13:26:43.871094945 -0400
+@@ -319,8 +319,8 @@ gboolean
+    the start of the selection is shown. If start_date is NULL it clears the
+    selection. */
+ void	e_calendar_item_set_selection		(ECalendarItem *calitem,
+-						 GDate *start_date,
+-						 GDate *end_date);
++						 const GDate *start_date,
++						 const GDate *end_date);
+ 
+ /* Marks a particular day. Passing E_CALENDAR_ITEM_MARK_BOLD as the day style
+    will result in the day being shown as bold by default. The style callback

evolution-2.30.2-unused-help-figure.patch

@@ -0,0 +1,22 @@
+diff -up evolution-2.30.2/help/Makefile.am.unused-help-figure evolution-2.30.2/help/Makefile.am
+--- evolution-2.30.2/help/Makefile.am.unused-help-figure	2010-07-25 06:29:21.199792883 -0400
++++ evolution-2.30.2/help/Makefile.am	2010-07-25 06:29:31.812054726 -0400
+@@ -42,7 +42,6 @@ DOC_FIGURES =  \
+ 	figures/evo_mboxreceive_a.png 		\
+ 	figures/evo_memo_a.png 			\
+ 	figures/evo_mhreceive_a.png 		\
+-	figures/evo_mail_notifier.png		\
+ 	figures/evo_memo_a.png			\
+ 	figures/evo_newmess_a.png 		\
+ 	figures/evo_newmail.png			\
+diff -up evolution-2.30.2/help/Makefile.in.unused-help-figure evolution-2.30.2/help/Makefile.in
+--- evolution-2.30.2/help/Makefile.in.unused-help-figure	2010-07-25 06:30:40.501792368 -0400
++++ evolution-2.30.2/help/Makefile.in	2010-07-25 06:30:57.463793008 -0400
+@@ -563,7 +563,6 @@ DOC_FIGURES = \
+ 	figures/evo_mboxreceive_a.png 		\
+ 	figures/evo_memo_a.png 			\
+ 	figures/evo_mhreceive_a.png 		\
+-	figures/evo_mail_notifier.png		\
+ 	figures/evo_memo_a.png			\
+ 	figures/evo_newmess_a.png 		\
+ 	figures/evo_newmail.png			\

evolution.spec

@@ -1,17 +1,17 @@
-%define dbus_glib_version 0.70
+%define dbus_glib_version 0.74
 %define dbus_version 1.0
-%define glib2_version 2.16.0
+%define glib2_version 2.22.0
 %define gnome_desktop_version 2.26.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.19.91
-%define gnome_pilot_version 2.0.15
-%define gtk2_version 2.14.0
-%define gtkhtml_version 3.29.6
+%define gnome_pilot_version 2.0.16
+%define gtk2_version 2.18.0
+%define gtkhtml_version 3.30.2
 %define intltool_version 0.35.5
 %define last_libgal2_version 2:2.5.3-2
 %define libgweather_version 2.25.4
 %define pilot_link_version 2:0.12.1
-%define soup_version 2.2.2
+%define soup_version 2.4.0
 
 %define evo_major 2.30
 
@@ -38,14 +38,14 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.29.90
-Release: 2%{?dist}
+Version: 2.30.3
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.30/%{name}-%{version}.tar.bz2
 
 Obsoletes: libgal2 <= %{last_libgal2_version}
 
@@ -62,6 +62,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
+# RH bug #589555
+Patch14: evolution-2.30.1-help-contents.patch
+
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -73,6 +76,7 @@ Requires: evolution-data-server >= %{version}
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
 Requires: gnome-themes
+Requires: gvfs
 
 ### Build Dependencies ###
 
@@ -95,7 +99,6 @@ BuildRequires: gtk-doc
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
 BuildRequires: gtkimageview-devel
-BuildRequires: gvfs
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libcanberra-devel
 BuildRequires: libgnomecanvas-devel >= 2.0
@@ -139,7 +142,6 @@ BuildRequires: libnotify-devel
 
 %if %{libpst_support}
 BuildRequires: libpst-devel
-BuildRequires: libytnef-devel
 %endif
 
 %description
@@ -167,6 +169,7 @@ Development files needed for building things which link against %{name}.
 Group: Applications/Productivity
 Summary: Help files for %{name}
 Requires: %{name} = %{version}-%{release}
+Requires: yelp
 BuildArch: noarch
 
 %description help
@@ -216,7 +219,6 @@ Group: Applications/Productivity
 Summary: PST importer plugin for Evolution
 Requires: %{name} = %{version}-%{release}
 Requires: libpst
-Requires: libytnef
 
 %description pst
 This package contains the plugin to import Microsoft Personal Storage Table
@@ -228,6 +230,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
+%patch14 -p1 -b .help-contents
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -442,12 +445,11 @@ rm -rf $RPM_BUILD_ROOT
 
 # The main executable
 %{_bindir}/evolution
-
-# The alarm notify daemon
-%{_bindir}/evolution-alarm-notify
+%{_bindir}/evolution-settings
 
 # Desktop files:
 %{_datadir}/applications/evolution.desktop
+%{_datadir}/applications/evolution-settings.desktop
 %{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop
 
 # Icons:
@@ -487,6 +489,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so.*
 %{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.*
 %{_libdir}/evolution/%{evo_major}/libevolution-mail.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-mail-settings.so.*
 %{_libdir}/evolution/%{evo_major}/libevolution-smime.so.*
 %{_libdir}/evolution/%{evo_major}/libfilter.so.*
 %{_libdir}/evolution/%{evo_major}/libmenus.so.*
@@ -495,6 +498,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libexecdir}/evolution
 %dir %{_libexecdir}/evolution/%{evo_major}
 %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
+%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
 %{_libexecdir}/evolution/%{evo_major}/evolution-backup
 %{_libexecdir}/evolution/%{evo_major}/killev
 
@@ -626,6 +630,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so
 %{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so
 %{_libdir}/evolution/%{evo_major}/libevolution-mail.so
+%{_libdir}/evolution/%{evo_major}/libevolution-mail-settings.so
 %{_libdir}/evolution/%{evo_major}/libevolution-smime.so
 %{_libdir}/evolution/%{evo_major}/libfilter.so
 %{_libdir}/evolution/%{evo_major}/libmenus.so
@@ -674,6 +679,76 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Aug 11 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.3-1.fc13
+- Update to 2.30.3
+- Remove patch for RH bug #617875 (fixed upstream).
+- Remove patch for GNOME bug #622547 (fixed upstream).
+- Remove patch for GNOME bug #622633 (fixed upstream).
+
+* Sun Jul 25 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.2-4.fc13
+- Add patch for RH bug #617875 (help figure softlinks to itself).
+
+* Thu Jun 24 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.2-3.fc13
+- Add patch for GNOME bug #622633 (handle startdate URIs).
+
+* Thu Jun 24 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.2-2.fc13
+- Add patch for GNOME bug #622547 (uncancelled idle cb in destroy).
+
+* Mon Jun 21 2010 Milan Crha <mcrha@redhat.com> - 2.30.2-1.fc13
+- Update to 2.30.2
+- Remove patch to fix the giant "mail-mark-notjunk" icon (fixed upstream)
+- Remove patch for RH bug #588004 (fixed upstream)
+- Remove patch for RH bug #590373 (fixed upstream)
+- Remove patch for GNOME bug #618400 (fixed upstream)
+- Remove patch for GNOME bug #618902 (fixed upstream)
+
+* Fri May 28 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.1-8.fc13
+- Add patch for RH bug #590373 (quietly close unchanged drafts).
+
+* Thu May 27 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.1-7.fc13
+- Add patch for GNOME bug #618400 (missing keyboard shortcut).
+
+* Tue May 18 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.1-6.fc13
+- Add patch for GNOME bug #618902 (mail browser window crash).
+
+* Sat May 08 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.1-5.fc13
+- Add patch for RH bug #588004 (missing icon in alarm dialogs).
+
+* Fri May 07 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.1-4.fc13
+- Require yelp in evolution-help (RH bug #589555).
+- Add patch for RH bug #589555 (hide Help->Contents if evolution-help
+  is not installed).
+
+* Sat May 01 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.1-3.fc13
+- Add patch to fix the giant "mail-mark-notjunk" icon.
+
+* Tue Apr 27 2010 Milan Crha <mcrha@redhat.com> - 2.30.1-2.fc13
+- Update to 2.30.1.2
+
+* Mon Apr 26 2010 Milan Crha <mcrha@redhat.com> - 2.30.1-1.fc13
+- Update to 2.30.1.1
+- Remove patch for missing icons (fixed upstream)
+
+* Thu Apr 22 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.0-3.fc13
+- Work around another dropped icon in gnome-icon-theme.
+
+* Wed Apr 14 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.0-2.fc13
+- Remove the dependency on libytnef, which apparently isn't needed for the
+  PST importer and we don't build the experimental TNEF attachments plugin.
+
+* Tue Mar 30 2010 Milan Crha <mcrha@redhat.com> - 2.30.0-1.fc13
+- Update to 2.30.0.1
+
+* Sun Mar 14 2010 Matthew Barnes <mbarnes@redhat.com> - 2.29.92-2.fc13
+- Require gvfs so that hypertext links and email attachments open as
+  expected on KDE.
+
+* Mon Mar 02 2010 Matthew Barnes <mbarnes@redhat.com> - 2.29.92-1.fc13
+- Update to 2.29.92
+
+* Mon Feb 22 2010 Milan Crha <mcrha@redhat.com> - 2.29.91-1.fc13
+- Update to 2.29.91
+
 * Tue Feb 09 2010 Milan Crha <mcrha@redhat.com> - 2.29.90-2.fc13
 - Rebuild against evolution-data-server-2.29.90-3
 

sources

@@ -1 +1 @@
-bc62be6f295eef36da32ccbf28cc03da  evolution-2.29.90.tar.bz2
+02d225cf130ed0cfcf90915b6ba977bf  evolution-2.30.3.tar.bz2