- Update to 2.23.90

- Bump eds_version to 2.23.90.1

.cvsignore

@@ -1 +1 @@
-evolution-2.23.6.tar.bz2
+evolution-2.23.90.tar.bz2

evolution-2.23.6-deprecated-gnuc-pretty-function.patch

@@ -1,84 +0,0 @@
-diff -U0 evolution-2.23.6/mail/ChangeLog.deprecated-gnuc-pretty-function evolution-2.23.6/mail/ChangeLog
-diff -up evolution-2.23.6/mail/em-migrate.c.deprecated-gnuc-pretty-function evolution-2.23.6/mail/em-migrate.c
---- evolution-2.23.6/mail/em-migrate.c.deprecated-gnuc-pretty-function	2008-08-01 02:37:53.000000000 -0400
-+++ evolution-2.23.6/mail/em-migrate.c	2008-08-04 14:53:29.000000000 -0400
-@@ -2934,7 +2934,7 @@ migrate_to_db()
- 				migrate_folders(store, info, account->name, &ex);
- 				
- 			} else
--				printf("%s(%d):%s: failed to get folder infos \n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
-+				printf("%s:%s: failed to get folder infos \n", G_STRLOC, G_STRFUNC);
- 			camel_exception_clear(&ex);
- 				
- 		}
-diff -up evolution-2.23.6/mail/em-network-prefs.c.deprecated-gnuc-pretty-function evolution-2.23.6/mail/em-network-prefs.c
---- evolution-2.23.6/mail/em-network-prefs.c.deprecated-gnuc-pretty-function	2008-08-01 02:37:52.000000000 -0400
-+++ evolution-2.23.6/mail/em-network-prefs.c	2008-08-04 14:53:29.000000000 -0400
-@@ -323,8 +323,7 @@ notify_proxy_type_changed (GtkWidget *wi
- 		emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, FALSE);
- 		emnp_set_sensitiveness (prefs, NETWORK_PROXY_AUTOCONFIG, FALSE);
- 		if (type == NETWORK_PROXY_SYS_SETTINGS) {
--			d(g_print ("%s:%s:%d: Loading sys settings... \n", 
--				   __FILE__,G_GNUC_PRETTY_FUNCTION, __LINE__));
-+			d(g_print ("%s:%s: Loading sys settings... \n", G_STRLOC, G_STRFUNC));
- 			emnp_load_sys_settings (prefs->gconf);
- 		}
- 
-@@ -357,11 +356,11 @@ widget_entry_changed_cb (GtkWidget *widg
- 	if (GTK_IS_SPIN_BUTTON (widget)) {
- 		port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget));
- 		gconf_client_set_int (gconf, (const char *)data, port, NULL);
--		d(g_print ("%s:%s:%d: %s is SpinButton: value = [%d]\n", __FILE__,G_GNUC_PRETTY_FUNCTION, __LINE__, (const char *)data, port));
-+		d(g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, (const char *)data, port));
- 	} else if (GTK_IS_ENTRY (widget)) {
- 		value = gtk_entry_get_text (GTK_ENTRY (widget));
- 		gconf_client_set_string (gconf, (const char *)data, value, NULL);
--		d(g_print ("%s:%s:%d: %s is Entry: value = [%s]\n", __FILE__,G_GNUC_PRETTY_FUNCTION, __LINE__, (const char *)data, value));
-+		d(g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, (const char *)data, value));
- 	}
- 
- }
-diff -up evolution-2.23.6/mail/em-subscribe-editor.c.deprecated-gnuc-pretty-function evolution-2.23.6/mail/em-subscribe-editor.c
---- evolution-2.23.6/mail/em-subscribe-editor.c.deprecated-gnuc-pretty-function	2008-07-18 02:19:05.000000000 -0400
-+++ evolution-2.23.6/mail/em-subscribe-editor.c	2008-08-04 14:53:29.000000000 -0400
-@@ -312,8 +312,8 @@ sub_fill_level(EMSubscribe *sub, CamelFo
- 					e_dlist_addtail(&sub->pending, (EDListNode *)node);
- 			}
- 		} else {
--			d(printf("%s:%d:%s: fi->flags & CAMEL_FOLDER_NOINFERIORS=%d\t node->path=[%p]\n",
--				 __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, fi->flags & CAMEL_FOLDER_NOINFERIORS,
-+			d(printf("%s:%s: fi->flags & CAMEL_FOLDER_NOINFERIORS=%d\t node->path=[%p]\n",
-+				 G_STRLOC, G_STRFUNC, fi->flags & CAMEL_FOLDER_NOINFERIORS,
- 				 node->path));
- 		}
- 
-@@ -408,7 +408,7 @@ sub_queue_fill_level(EMSubscribe *sub, E
- 	struct _emse_folderinfo_msg *m;
- 	int id;
- 
--	d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__,
-+	d(printf("%s:%s: Starting get folderinfo of '%s'\n", G_STRLOC, G_STRFUNC,
- 		 node?node->info->full_name:"<root>"));
- 
- 	m = mail_msg_new (&sub_folderinfo_info);
-@@ -501,7 +501,7 @@ sub_row_expanded(GtkTreeView *tree, GtkT
- 	char *row_name;
- 
- 	gtk_tree_model_get(model, iter, 1, &row_name, -1);
--	d(printf("%s:%d:%s: row-expanded '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__,
-+	d(printf("%s:%s: row-expanded '%s'\n", G_STRLOC, G_STRFUNC,
- 		 row_name?row_name:"<root>"));
- 
- 	/* Do we really need to fetch the children for this row? */
-diff -up evolution-2.23.6/mail/mail-vfolder.c.deprecated-gnuc-pretty-function evolution-2.23.6/mail/mail-vfolder.c
---- evolution-2.23.6/mail/mail-vfolder.c.deprecated-gnuc-pretty-function	2008-07-18 02:19:05.000000000 -0400
-+++ evolution-2.23.6/mail/mail-vfolder.c	2008-08-04 14:53:29.000000000 -0400
-@@ -50,7 +50,7 @@
- #include "mail-tools.h"
- #include "mail-vfolder.h"
- 
--#define d(x)  /* (printf("%s(%d):%s: ",  __FILE__, __LINE__, __PRETTY_FUNCTION__), (x))*/
-+#define d(x)  /* (printf("%s:%s: ",  G_STRLOC, G_STRFUNC), (x))*/
- 
- static EMVFolderContext *context;	/* context remains open all time */
- CamelStore *vfolder_store; /* the 1 static vfolder store */

evolution.spec

@@ -1,6 +1,6 @@
 %define dbus_glib_version 0.70
 %define dbus_version 1.0
-%define eds_version 2.23.5
+%define eds_version 2.23.90.1
 %define glib2_version 2.16.0
 %define gnome_doc_utils_version 0.8.0
 %define gnome_icon_theme_version 2.19.91
@@ -44,7 +44,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.23.6
+Version: 2.23.90
 Release: 1%{?dist}
 License: GPLv2 and GFDL
 Group: Applications/Productivity
@@ -80,9 +80,6 @@ Patch14: evolution-2.9.1-im-context-reset.patch
 # Don't ship broken plugins as stable
 Patch15: evolution-2.23.4-experimental-plugins.patch
 
-# The usual regressions...
-Patch16: evolution-2.23.6-deprecated-gnuc-pretty-function.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -227,7 +224,6 @@ This package contains the plugin to filter junk mail using SpamAssassin.
 %patch13 -p1 -b .no-gnome-common
 %patch14 -p1 -b .im-context-reset
 %patch15 -p1 -b .experimental-plugins
-%patch16 -p1 -b .deprecated-gnuc-pretty-function
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -407,12 +403,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/evolution.desktop
 
 # Icons:
-%{_datadir}/icons/hicolor/16x16/apps/evolution.png
+%{_datadir}/icons/hicolor/16x16/apps/
-%{_datadir}/icons/hicolor/22x22/apps/evolution.png
+%{_datadir}/icons/hicolor/22x22/apps/
-%{_datadir}/icons/hicolor/24x24/apps/evolution.png
+%{_datadir}/icons/hicolor/24x24/apps/
-%{_datadir}/icons/hicolor/32x32/apps/evolution.png
+%{_datadir}/icons/hicolor/32x32/apps/
-%{_datadir}/icons/hicolor/48x48/apps/evolution.png
+%{_datadir}/icons/hicolor/48x48/apps/
-%{_datadir}/icons/hicolor/scalable/apps/evolution.svg
+%{_datadir}/icons/hicolor/scalable/apps/
 
 # IDL files (should this be in devel subpackage?)
 %{_datadir}/idl/evolution-%{evo_major}
@@ -656,6 +652,10 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Wed Aug 20 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.90-1.fc10
+- Update to 2.23.90
+- Bump eds_version to 2.23.90.1
+
 * Mon Aug 04 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.6-1.fc10
 - Update to 2.23.6
 

sources

@@ -1 +1 @@
-dffdac5928c01a16a80c638bd02ae871  evolution-2.23.6.tar.bz2
+822234b835811a8abdacb1f865a5cb55  evolution-2.23.90.tar.bz2