rpms/evolution/devel .cvsignore, 1.64, 1.65 evolution-2.8.0-fix-indic-printing.patch, 1.3, 1.4 evolution-2.9.3-gtk-color-button.patch, 1.1, 1.2 evolution.spec, 1.226, 1.227 sources, 1.64, 1.65 evolution-2.8.0-deprecated-gdk-font.patch, 1.1, NONE evolution-2.9.3-implicit-function-declaration.patch, 1.1, NONE evolution-2.9.5-change-msgport-semantics.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Feb 12 19:40:14 UTC 2007


Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4333

Modified Files:
	.cvsignore evolution-2.8.0-fix-indic-printing.patch 
	evolution-2.9.3-gtk-color-button.patch evolution.spec sources 
Removed Files:
	evolution-2.8.0-deprecated-gdk-font.patch 
	evolution-2.9.3-implicit-function-declaration.patch 
	evolution-2.9.5-change-msgport-semantics.patch 
Log Message:

* Mon Feb 12 2007 Matthew Barnes <mbarnes at redhat.com> - 2.9.91-1.fc7
- Update to 2.9.91
- Require gtkhtml3 >= 3.13.6.
- Add files for new imap-features plugin.
- Add flag to disable deprecated Pango symbols.
- Remove patch for GNOME bug #357216 (fixed upstream).
- Remove patch for GNOME bug #359979 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	9 Jan 2007 02:53:59 -0000	1.64
+++ .cvsignore	12 Feb 2007 19:40:06 -0000	1.65
@@ -1 +1 @@
-evolution-2.9.5.tar.bz2
+evolution-2.9.91.tar.bz2

evolution-2.8.0-fix-indic-printing.patch:
 composer/e-msg-composer.c             |   43 ++++++++++++++++++++++++++++++++++
 composer/e-msg-composer.h             |    2 +
 plugins/print-message/print-message.c |    4 +--
 3 files changed, 47 insertions(+), 2 deletions(-)

Index: evolution-2.8.0-fix-indic-printing.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.8.0-fix-indic-printing.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evolution-2.8.0-fix-indic-printing.patch	20 Dec 2006 16:28:16 -0000	1.3
+++ evolution-2.8.0-fix-indic-printing.patch	12 Feb 2007 19:40:06 -0000	1.4
@@ -1,26 +1,26 @@
---- evolution-2.9.4/plugins/print-message/print-message.c.fix-indic-printing	2005-08-23 23:14:10.000000000 -0400
-+++ evolution-2.9.4/plugins/print-message/print-message.c	2006-12-19 16:58:21.000000000 -0500
+--- evolution-2.9.91/plugins/print-message/print-message.c.fix-indic-printing	2007-02-12 01:58:01.000000000 -0500
++++ evolution-2.9.91/plugins/print-message/print-message.c	2007-02-12 13:30:17.000000000 -0500
 @@ -83,7 +83,7 @@
- 	data->config = e_print_load_config ();
+ 	data->config = e_print_load_settings ();
  	data->preview = 0;
  	
 -	data->msg = e_msg_composer_get_message (composer, 1);
 +	data->msg = e_msg_composer_get_message_print (composer, 1);
- 	dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), GNOME_PRINT_DIALOG_COPIES, data->config);
- 	gtk_dialog_set_default_response(dialog, GNOME_PRINT_DIALOG_RESPONSE_PRINT);
+ 	dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), 0, data->config);
+ 	gtk_dialog_set_default_response(dialog, GTK_RESPONSE_OK);
  	e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) composer);
-@@ -104,7 +104,7 @@
- 	data->config = e_print_load_config ();
+@@ -102,7 +102,7 @@
+ 	data->config = e_print_load_settings ();
  	data->preview = 0;
  	
 -	data->msg = e_msg_composer_get_message (composer, 1);
 +	data->msg = e_msg_composer_get_message_print (composer, 1);
  
- 	print_response(NULL, GNOME_PRINT_DIALOG_RESPONSE_PREVIEW, data);
+ 	print_response(NULL, GTK_RESPONSE_APPLY, data);
  }
---- evolution-2.9.4/composer/e-msg-composer.h.fix-indic-printing	2005-12-07 03:29:51.000000000 -0500
-+++ evolution-2.9.4/composer/e-msg-composer.h	2006-12-19 16:58:21.000000000 -0500
-@@ -96,6 +96,8 @@
+--- evolution-2.9.91/composer/e-msg-composer.h.fix-indic-printing	2007-01-22 10:23:06.000000000 -0500
++++ evolution-2.9.91/composer/e-msg-composer.h	2007-02-12 13:29:24.000000000 -0500
+@@ -101,6 +101,8 @@
  									  CamelMimePart     *part);
  CamelMimeMessage        *e_msg_composer_get_message                      (EMsgComposer      *composer,
  									  gboolean           save_html_object_data);
@@ -29,9 +29,9 @@
  CamelMimeMessage        *e_msg_composer_get_message_draft                (EMsgComposer      *composer);
  void                     e_msg_composer_show_sig_file                    (EMsgComposer      *composer);
  gboolean                 e_msg_composer_get_send_html                    (EMsgComposer      *composer);
---- evolution-2.9.4/composer/e-msg-composer.c.fix-indic-printing	2006-12-19 16:58:21.000000000 -0500
-+++ evolution-2.9.4/composer/e-msg-composer.c	2006-12-20 10:44:45.000000000 -0500
-@@ -5189,6 +5189,49 @@
+--- evolution-2.9.91/composer/e-msg-composer.c.fix-indic-printing	2007-02-12 13:29:24.000000000 -0500
++++ evolution-2.9.91/composer/e-msg-composer.c	2007-02-12 13:29:24.000000000 -0500
+@@ -5267,6 +5267,49 @@
  }
  
  CamelMimeMessage *

evolution-2.9.3-gtk-color-button.patch:
 calendar/gui/calendar-component.c                   |    2 
 calendar/gui/calendar-config.c                      |   84 ++++++++---
 calendar/gui/calendar-config.h                      |    9 -
 calendar/gui/dialogs/cal-prefs-dialog.c             |   56 ++-----
 calendar/gui/dialogs/cal-prefs-dialog.glade         |    6 
 calendar/gui/dialogs/calendar-setup.c               |  144 +++++++++-----------
 calendar/gui/e-cal-model-tasks.c                    |   18 ++
 calendar/gui/e-cal-model.c                          |    7 
 calendar/gui/memos-component.c                      |    2 
 calendar/gui/migration.c                            |   10 -
 calendar/gui/tasks-component.c                      |    2 
 filter/filter-colour.c                              |  108 ++++++---------
 filter/filter-colour.h                              |    2 
 filter/filter-element.c                             |    8 -
 mail/em-composer-prefs.c                            |   41 +++--
 mail/em-composer-prefs.h                            |    3 
 mail/em-mailer-prefs.c                              |   71 +++------
 mail/em-mailer-prefs.h                              |    5 
 mail/mail-config.glade                              |   23 +--
 plugins/groupwise-account-setup/camel-gw-listener.c |    9 -
 20 files changed, 306 insertions(+), 304 deletions(-)

Index: evolution-2.9.3-gtk-color-button.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.9.3-gtk-color-button.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.9.3-gtk-color-button.patch	19 Dec 2006 22:24:50 -0000	1.1
+++ evolution-2.9.3-gtk-color-button.patch	12 Feb 2007 19:40:06 -0000	1.2
@@ -1,5 +1,5 @@
---- evolution-2.9.4/mail/em-composer-prefs.c.gtk-color-button	2006-07-11 12:47:09.000000000 -0400
-+++ evolution-2.9.4/mail/em-composer-prefs.c	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/mail/em-composer-prefs.c.gtk-color-button	2007-01-03 10:27:18.000000000 -0500
++++ evolution-2.9.91/mail/em-composer-prefs.c	2007-02-12 13:32:03.000000000 -0500
 @@ -56,9 +56,8 @@
  #include <gtk/gtkcellrenderertext.h>
  #include <gtk/gtkimage.h>
@@ -90,8 +90,8 @@
  		gtk_widget_hide (GTK_WIDGET (prefs->language));
  	}
  	
---- evolution-2.9.4/mail/mail-config.glade.gtk-color-button	2006-12-19 16:06:48.000000000 -0500
-+++ evolution-2.9.4/mail/mail-config.glade	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/mail/mail-config.glade.gtk-color-button	2007-02-12 13:32:03.000000000 -0500
++++ evolution-2.9.91/mail/mail-config.glade	2007-02-12 13:32:03.000000000 -0500
 @@ -5138,10 +5138,9 @@
  			      </child>
  
@@ -185,8 +185,8 @@
  			      <property name="use_alpha">False</property>
  			      <property name="title" translatable="yes">Pick a color</property>
  			      <property name="focus_on_click">True</property>
---- evolution-2.9.4/mail/em-mailer-prefs.h.gtk-color-button	2006-12-19 16:06:48.000000000 -0500
-+++ evolution-2.9.4/mail/em-mailer-prefs.h	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/mail/em-mailer-prefs.h.gtk-color-button	2007-02-12 13:32:03.000000000 -0500
++++ evolution-2.9.91/mail/em-mailer-prefs.h	2007-02-12 13:32:03.000000000 -0500
 @@ -37,7 +37,6 @@
  struct _GdkPixbuf;
  struct _GtkWidget;
@@ -213,8 +213,8 @@
  	} labels[5];
  	struct _GtkButton *restore_labels;
  
---- evolution-2.9.4/mail/em-composer-prefs.h.gtk-color-button	2005-01-24 16:11:07.000000000 -0500
-+++ evolution-2.9.4/mail/em-composer-prefs.h	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/mail/em-composer-prefs.h.gtk-color-button	2007-01-03 10:27:18.000000000 -0500
++++ evolution-2.9.91/mail/em-composer-prefs.h	2007-02-12 13:32:03.000000000 -0500
 @@ -48,7 +48,6 @@
  struct _GdkPixbuf;
  struct _GtkWidget;
@@ -232,8 +232,8 @@
  	struct _GtkTreeView *language;
  	CORBA_sequence_GNOME_Spell_Language *language_seq;
  	gboolean spell_active;
---- evolution-2.9.4/mail/em-mailer-prefs.c.gtk-color-button	2006-12-19 16:06:48.000000000 -0500
-+++ evolution-2.9.4/mail/em-mailer-prefs.c	2006-12-19 16:08:24.000000000 -0500
+--- evolution-2.9.91/mail/em-mailer-prefs.c.gtk-color-button	2007-02-12 13:32:03.000000000 -0500
++++ evolution-2.9.91/mail/em-mailer-prefs.c	2007-02-12 13:32:03.000000000 -0500
 @@ -35,7 +35,7 @@
  #include "misc/e-charset-picker.h"
  #include <bonobo/bonobo-generic-factory.h>
@@ -361,8 +361,8 @@
  		g_signal_connect (prefs->labels[i].color, "color-set", G_CALLBACK (label_color_set), prefs);
  		
  		atk_object_set_name(gtk_widget_get_accessible((GtkWidget *)prefs->labels[i].color), label->name);
---- evolution-2.9.4/filter/filter-colour.h.gtk-color-button	2002-11-01 17:07:46.000000000 -0500
-+++ evolution-2.9.4/filter/filter-colour.h	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/filter/filter-colour.h.gtk-color-button	2007-01-03 10:27:18.000000000 -0500
++++ evolution-2.9.91/filter/filter-colour.h	2007-02-12 13:32:03.000000000 -0500
 @@ -39,7 +39,7 @@
  struct _FilterColour {
  	FilterElement parent_object;
@@ -372,8 +372,8 @@
  };
  
  struct _FilterColourClass {
---- evolution-2.9.4/filter/filter-colour.c.gtk-color-button	2004-12-02 22:41:39.000000000 -0500
-+++ evolution-2.9.4/filter/filter-colour.c	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/filter/filter-colour.c.gtk-color-button	2007-01-03 10:27:18.000000000 -0500
++++ evolution-2.9.91/filter/filter-colour.c	2007-02-12 13:32:03.000000000 -0500
 @@ -26,7 +26,7 @@
  #endif
  
@@ -533,8 +533,8 @@
 +		fc->color.red, fc->color.green, fc->color.blue);
 +	e_sexp_encode_string (out, spec);
  }
---- evolution-2.9.4/filter/filter-element.c.gtk-color-button	2006-02-08 06:44:27.000000000 -0500
-+++ evolution-2.9.4/filter/filter-element.c	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/filter/filter-element.c.gtk-color-button	2007-01-03 10:27:18.000000000 -0500
++++ evolution-2.9.91/filter/filter-element.c	2007-02-12 13:32:03.000000000 -0500
 @@ -293,12 +293,10 @@
  		}
  	} else if (IS_FILTER_COLOUR(se)) {
@@ -551,23 +551,28 @@
  		}
  	} else if (IS_FILTER_DATESPEC(se)) {
  		if (IS_FILTER_DATESPEC(de)) {
---- evolution-2.9.4/plugins/groupwise-account-setup/camel-gw-listener.c.gtk-color-button	2006-12-04 08:14:34.000000000 -0500
-+++ evolution-2.9.4/plugins/groupwise-account-setup/camel-gw-listener.c	2006-12-19 16:07:37.000000000 -0500
-@@ -213,10 +213,10 @@
+--- evolution-2.9.91/plugins/groupwise-account-setup/camel-gw-listener.c.gtk-color-button	2007-02-09 15:16:33.000000000 -0500
++++ evolution-2.9.91/plugins/groupwise-account-setup/camel-gw-listener.c	2007-02-12 13:41:50.000000000 -0500
+@@ -212,12 +212,13 @@
+ 	e_source_set_property (source, "use_ssl", use_ssl);
  	e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" );
  	if (parent_id_name) {
+-		guint32 color;
++		char *color;
  		e_source_set_property (source, "parent_id_name", parent_id_name);
--		e_source_set_color (source, 0xFF00FF);
-+		e_source_set_color_spec (source, "#FF00FF");
- 	}
- 	else
+-		color = (guint32) atoi((char *)(camel_url_get_param (url, "color")));
+-		e_source_set_color (source, color);
++		color = g_strdup_printf ("#%s", camel_url_get_param (url, "color"));
++		e_source_set_color_spec (source, color);
++		g_free (color);
+ 	} else
 -		e_source_set_color (source, 0xEEBC60);
 +		e_source_set_color_spec (source, "#EEBC60");
  	e_source_group_add_source (group, source, -1);
  	e_source_list_sync (source_list, NULL);
  
---- evolution-2.9.4/calendar/gui/tasks-component.c.gtk-color-button	2006-12-04 08:14:30.000000000 -0500
-+++ evolution-2.9.4/calendar/gui/tasks-component.c	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/calendar/gui/tasks-component.c.gtk-color-button	2007-01-03 10:28:00.000000000 -0500
++++ evolution-2.9.91/calendar/gui/tasks-component.c	2007-02-12 13:32:03.000000000 -0500
 @@ -209,7 +209,7 @@
  			calendar_config_set_tasks_selected (&selected);
  		}
@@ -577,8 +582,8 @@
  		personal_source = source;
  	}
  
---- evolution-2.9.4/calendar/gui/dialogs/cal-prefs-dialog.c.gtk-color-button	2006-12-19 16:06:48.000000000 -0500
-+++ evolution-2.9.4/calendar/gui/dialogs/cal-prefs-dialog.c	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.c.gtk-color-button	2007-02-12 13:32:02.000000000 -0500
++++ evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.c	2007-02-12 13:32:03.000000000 -0500
 @@ -96,21 +96,6 @@
  	return glade_xml_get_widget (prefs->gui, item->label);
  }
@@ -671,8 +676,8 @@
  
  	/* Hide Completed Tasks. */
  	e_dialog_toggle_set (prefs->tasks_hide_completed, calendar_config_get_hide_completed_tasks ());
---- evolution-2.9.4/calendar/gui/dialogs/calendar-setup.c.gtk-color-button	2006-07-19 09:04:45.000000000 -0400
-+++ evolution-2.9.4/calendar/gui/dialogs/calendar-setup.c	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/calendar/gui/dialogs/calendar-setup.c.gtk-color-button	2007-01-03 10:27:56.000000000 -0500
++++ evolution-2.9.91/calendar/gui/dialogs/calendar-setup.c	2007-02-12 13:32:03.000000000 -0500
 @@ -73,44 +73,22 @@
  }
  
@@ -903,8 +908,8 @@
  	} else {
  		GConfClient *gconf;
  		GSList *l;
---- evolution-2.9.4/calendar/gui/dialogs/cal-prefs-dialog.glade.gtk-color-button	2006-07-10 06:42:58.000000000 -0400
-+++ evolution-2.9.4/calendar/gui/dialogs/cal-prefs-dialog.glade	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.glade.gtk-color-button	2007-01-03 10:27:56.000000000 -0500
++++ evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.glade	2007-02-12 13:32:03.000000000 -0500
 @@ -1231,10 +1231,9 @@
  		      </child>
  
@@ -929,8 +934,8 @@
  			  <property name="use_alpha">False</property>
  			  <property name="title" translatable="yes">Pick a color</property>
  			  <property name="focus_on_click">True</property>
---- evolution-2.9.4/calendar/gui/e-cal-model-tasks.c.gtk-color-button	2006-10-16 14:13:48.000000000 -0400
-+++ evolution-2.9.4/calendar/gui/e-cal-model-tasks.c	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/calendar/gui/e-cal-model-tasks.c.gtk-color-button	2007-01-08 09:50:33.000000000 -0500
++++ evolution-2.9.91/calendar/gui/e-cal-model-tasks.c	2007-02-12 13:32:03.000000000 -0500
 @@ -1025,14 +1025,28 @@
  static const char *
  ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data)
@@ -962,8 +967,8 @@
  	case E_CAL_MODEL_TASKS_DUE_NEVER:
  	case E_CAL_MODEL_TASKS_DUE_FUTURE:
  	case E_CAL_MODEL_TASKS_DUE_COMPLETE:
---- evolution-2.9.4/calendar/gui/memos-component.c.gtk-color-button	2006-10-16 14:13:51.000000000 -0400
-+++ evolution-2.9.4/calendar/gui/memos-component.c	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/calendar/gui/memos-component.c.gtk-color-button	2007-01-03 10:28:00.000000000 -0500
++++ evolution-2.9.91/calendar/gui/memos-component.c	2007-02-12 13:32:03.000000000 -0500
 @@ -213,7 +213,7 @@
  			calendar_config_set_memos_selected (&selected);
  		}
@@ -973,8 +978,8 @@
  		personal_source = source;
  	}
  
---- evolution-2.9.4/calendar/gui/calendar-component.c.gtk-color-button	2006-09-21 01:41:00.000000000 -0400
-+++ evolution-2.9.4/calendar/gui/calendar-component.c	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/calendar/gui/calendar-component.c.gtk-color-button	2007-01-03 10:28:00.000000000 -0500
++++ evolution-2.9.91/calendar/gui/calendar-component.c	2007-02-12 13:32:03.000000000 -0500
 @@ -252,7 +252,7 @@
  		}
  
@@ -984,8 +989,8 @@
  	}
  
  	if (!on_the_web) {
---- evolution-2.9.4/calendar/gui/e-cal-model.c.gtk-color-button	2006-11-20 09:16:34.000000000 -0500
-+++ evolution-2.9.4/calendar/gui/e-cal-model.c	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/calendar/gui/e-cal-model.c.gtk-color-button	2007-01-08 09:50:33.000000000 -0500
++++ evolution-2.9.91/calendar/gui/e-cal-model.c	2007-02-12 13:32:03.000000000 -0500
 @@ -947,7 +947,7 @@
  ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data)
  {
@@ -1008,8 +1013,8 @@
  		return comp_data->color;
  	}
                                                                     
---- evolution-2.9.4/calendar/gui/calendar-config.h.gtk-color-button	2006-07-17 02:01:28.000000000 -0400
-+++ evolution-2.9.4/calendar/gui/calendar-config.h	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/calendar/gui/calendar-config.h.gtk-color-button	2007-01-03 10:28:00.000000000 -0500
++++ evolution-2.9.91/calendar/gui/calendar-config.h	2007-02-12 13:32:03.000000000 -0500
 @@ -31,6 +31,7 @@
  #define _CALENDAR_CONFIG_H_
  
@@ -1034,8 +1039,8 @@
  
  /* Settings to hide completed tasks. */
  gboolean  calendar_config_get_hide_completed_tasks	(void);
---- evolution-2.9.4/calendar/gui/migration.c.gtk-color-button	2006-10-16 14:13:51.000000000 -0400
-+++ evolution-2.9.4/calendar/gui/migration.c	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/calendar/gui/migration.c.gtk-color-button	2007-01-03 10:28:00.000000000 -0500
++++ evolution-2.9.91/calendar/gui/migration.c	2007-02-12 13:32:03.000000000 -0500
 @@ -406,7 +406,7 @@
  	e_source_group_add_source (group, source, -1);
  	g_object_unref (source);
@@ -1081,8 +1086,8 @@
  	e_source_group_add_source (group, source, -1);
  
  	ids = gconf_client_get_list (client, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, GCONF_VALUE_STRING, NULL);
---- evolution-2.9.4/calendar/gui/calendar-config.c.gtk-color-button	2006-12-04 08:14:29.000000000 -0500
-+++ evolution-2.9.4/calendar/gui/calendar-config.c	2006-12-19 16:07:37.000000000 -0500
+--- evolution-2.9.91/calendar/gui/calendar-config.c.gtk-color-button	2007-01-03 10:28:00.000000000 -0500
++++ evolution-2.9.91/calendar/gui/calendar-config.c	2007-02-12 13:32:03.000000000 -0500
 @@ -1219,68 +1219,104 @@
  
  /**


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -r1.226 -r1.227
--- evolution.spec	26 Jan 2007 18:54:04 -0000	1.226
+++ evolution.spec	12 Feb 2007 19:40:06 -0000	1.227
@@ -6,7 +6,7 @@
 %define gnome_icon_theme_version 1.3.6
 %define gnome_pilot_version 2.0.13
 %define gnomevfs2_version 2.4
-%define gtkhtml_version 3.9.2
+%define gtkhtml_version 3.13.6
 %define last_libgal2_version 2:2.5.3-2
 %define libbonoboui_version 2.4.2
 %define libgnomeprint22_version 2.8.0
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.9.5
-Release: 4%{?dist}
+Version: 2.9.91
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -115,9 +115,6 @@
 # GNOME bug #356177
 Patch27: evolution-2.8.0-kill-emutex.patch
 
-# GNOME bug #357216
-Patch28: evolution-2.8.0-deprecated-gdk-font.patch
-
 # RH bug #202751 / GNOME bug #355766
 Patch29: evolution-2.8.0-fix-indic-printing.patch
 
@@ -160,9 +157,6 @@
 # GNOME bug #218898
 Patch42: evolution-2.9.4-view-message-source.patch
 
-# GNOME bug #359979
-Patch43: evolution-2.9.5-change-msgport-semantics.patch
-
 ## Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -294,7 +288,6 @@
 %patch25 -p1 -b .fix-prgname
 %patch26 -p1 -b .indic-cursor-movement
 %patch27 -p1 -b .kill-emutex
-%patch28 -p1 -b .deprecated-gdk-font
 %patch29 -p1 -b .fix-indic-printing
 %patch30 -p1 -b .about-dialog
 %patch31 -p1 -b .kill-ethread
@@ -309,7 +302,6 @@
 %patch40 -p1 -b .meeting-list-view
 %patch41 -p1 -b .gtk-color-button
 %patch42 -p1 -b .view-message-source
-%patch43 -p1 -b .change-msgport-semantics
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -389,6 +381,7 @@
 %if %{strict_build_settings}
 CFLAGS="$CFLAGS \
 	-DG_DISABLE_DEPRECATED=1 \
+        -DPANGO_DISABLE_DEPRECATED=1 \
 	-DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
 	-DGDK_DISABLE_DEPRECATED=1 \
 	-DEDS_DISABLE_DEPRECATED=1 \
@@ -639,6 +632,9 @@
 %{evo_plugin_dir}/org-gnome-gw-account-setup.eplug
 %{evo_plugin_dir}/liborg-gnome-gw-account-setup.so
 
+%{evo_plugin_dir}/org-gnome-imap-features.eplug
+%{evo_plugin_dir}/liborg-gnome-imap-features.so
+
 %{evo_plugin_dir}/org-gnome-itip-formatter.eplug
 %{evo_plugin_dir}/liborg-gnome-itip-formatter.so
 
@@ -725,6 +721,14 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Feb 12 2007 Matthew Barnes <mbarnes at redhat.com> - 2.9.91-1.fc7
+- Update to 2.9.91
+- Require gtkhtml3 >= 3.13.6.
+- Add files for new imap-features plugin.
+- Add flag to disable deprecated Pango symbols.
+- Remove patch for GNOME bug #357216 (fixed upstream).
+- Remove patch for GNOME bug #359979 (fixed upstream).
+
 * Fri Jan 26 2007 Matthew Barnes <mbarnes at redhat.com> - 2.9.5-4.fc7
 - Compile with the -fno-strict-aliasing flag, which will hopefully improve
   reliability until the illegal type-punning is fixed (RH bug #224552).


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	9 Jan 2007 02:53:59 -0000	1.64
+++ sources	12 Feb 2007 19:40:06 -0000	1.65
@@ -1,6 +1 @@
-ef0c0eaff9fc7c3372bcac947d0cb0b8  evolution-2.9.5.tar.bz2
-4737f9b111e5e4b2fccc9e9b464c4b01  evolution16.png
-de663fa442d61f53dc058dd20c77da8e  evolution22.png
-d33896d33b5db2201e051664e96b1100  evolution24.png
-2fa4ce12c94153aca9af465e1a1819c8  evolution32.png
-e85874e8d480a9c82bc155da396a54e4  evolution.svg
+8acb0abc5620d4240217cc9293ba650b  evolution-2.9.91.tar.bz2


--- evolution-2.8.0-deprecated-gdk-font.patch DELETED ---


--- evolution-2.9.3-implicit-function-declaration.patch DELETED ---


--- evolution-2.9.5-change-msgport-semantics.patch DELETED ---




More information about the fedora-cvs-commits mailing list