Mon Jun 4 20:08:25 UTC 2007

Author: mbarnes

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

Modified Files:
	.cvsignore 
	evolution-2.4.1-hide-switcher-buttons-by-default.patch 
	evolution-2.5.4-fix-conduit-dir.patch 
	evolution-2.8.1-kill-ethread.patch 
	evolution-2.9.1-kill-ememory.patch evolution.spec sources 
Added Files:
	evolution-2.11.3-implicit-function-declaration.patch 
Removed Files:
	evolution-2.10.1-check-uri-before-strcmp.patch 
	evolution-2.10.1-fix-help.patch 
	evolution-2.10.1-send-recv-dialog.patch 
	evolution-2.7.92-fix-prgname.patch 
Log Message:

* Mon Jun 04 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.3-1.fc8
- Update to 2.11.3
- Evolution no longer has versioned file names.
- Remove patch for RH bug #202289 (fixed upstream).
- Remove patch for RH bug #235878 (fixed upstream).
- Remove patch for RH bug #238155 (fixed upstream).
- Remove patch for RH bug #240147 (fixed upstream).


evolution-2.11.3-implicit-function-declaration.patch:

--- NEW FILE evolution-2.11.3-implicit-function-declaration.patch ---
--- evolution-2.11.3/mail/mail-ops.h.implicit-function-declaration	2007-06-04 13:52:57.000000000 -0400
+++ evolution-2.11.3/mail/mail-ops.h	2007-06-04 13:53:23.000000000 -0400
@@ -156,6 +156,7 @@ void mail_prep_offline(const char *uri, 
 int mail_store_set_offline(CamelStore *store, gboolean offline,
 			   void (*done)(CamelStore *, void *data),
 			   void *data);
+int mail_store_prepare_offline (CamelStore *store);
 
 /* filter driver execute shell command async callback */
 void mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, void *data);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- .cvsignore	19 May 2007 00:56:12 -0000	1.70
+++ .cvsignore	4 Jun 2007 20:07:28 -0000	1.71
@@ -1 +1 @@
-evolution-2.11.2.tar.bz2
+evolution-2.11.3.tar.bz2

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

Index: evolution-2.4.1-hide-switcher-buttons-by-default.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.4.1-hide-switcher-buttons-by-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.4.1-hide-switcher-buttons-by-default.patch	26 Oct 2005 21:46:35 -0000	1.1
+++ evolution-2.4.1-hide-switcher-buttons-by-default.patch	4 Jun 2007 20:07:28 -0000	1.2
@@ -1,5 +1,5 @@
---- evolution-2.4.1/shell/apps_evolution_shell.schemas.in.in.hide-switcher-buttons-by-default	2005-10-26 16:21:15.000000000 -0400
-+++ evolution-2.4.1/shell/apps_evolution_shell.schemas.in.in	2005-10-26 16:21:22.000000000 -0400
+--- evolution-2.4.1/shell/apps_evolution_shell.schemas.in.hide-switcher-buttons-by-default	2005-10-26 16:21:15.000000000 -0400
++++ evolution-2.4.1/shell/apps_evolution_shell.schemas.in	2005-10-26 16:21:22.000000000 -0400
 @@ -99,7 +99,7 @@
        <applyto>/apps/evolution/shell/view_defaults/buttons_visible</applyto>
        <owner>evolution</owner>

evolution-2.5.4-fix-conduit-dir.patch:

Index: evolution-2.5.4-fix-conduit-dir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.5.4-fix-conduit-dir.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-2.5.4-fix-conduit-dir.patch	22 Jan 2007 03:37:21 -0000	1.2
+++ evolution-2.5.4-fix-conduit-dir.patch	4 Jun 2007 20:07:28 -0000	1.3
@@ -1,88 +1,88 @@
---- evolution-2.9.5/addressbook/conduit/Makefile.am.fix-conduit-dir	2007-01-03 10:32:47.000000000 -0500
-+++ evolution-2.9.5/addressbook/conduit/Makefile.am	2007-01-21 22:05:23.000000000 -0500
-@@ -28,7 +28,7 @@
+--- evolution-2.11.3/addressbook/conduit/Makefile.am.fix-conduit-dir	2007-06-03 11:07:44.000000000 -0400
++++ evolution-2.11.3/addressbook/conduit/Makefile.am	2007-06-04 12:55:32.000000000 -0400
+@@ -28,7 +28,7 @@ e-address.conduit: e-address.conduit.in
  	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
  	    $< > $@
  
 -conduitdir = $(datadir)/gnome-pilot/conduits/
 +conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-address-$(BASE_VERSION).conduit
+ conduit_DATA = e-address.conduit
  
  BUILT_SOURCES = $(conduit_DATA)
---- evolution-2.9.5/addressbook/conduit/Makefile.in.fix-conduit-dir	2007-01-21 22:05:44.000000000 -0500
-+++ evolution-2.9.5/addressbook/conduit/Makefile.in	2007-01-21 22:06:04.000000000 -0500
-@@ -459,7 +459,7 @@
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la		 	\
+--- evolution-2.11.3/addressbook/conduit/Makefile.in.fix-conduit-dir	2007-06-04 07:36:46.000000000 -0400
++++ evolution-2.11.3/addressbook/conduit/Makefile.in	2007-06-04 12:55:53.000000000 -0400
+@@ -459,7 +459,7 @@ libeaddress_conduit_la_LIBADD = \
+ 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
  	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
  
 -conduitdir = $(datadir)/gnome-pilot/conduits/
 +conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-address-$(BASE_VERSION).conduit
+ conduit_DATA = e-address.conduit
  BUILT_SOURCES = $(conduit_DATA)
  CLEANFILES = $(BUILT_SOURCES)
---- evolution-2.9.5/calendar/conduits/todo/Makefile.am.fix-conduit-dir	2007-01-03 10:34:54.000000000 -0500
-+++ evolution-2.9.5/calendar/conduits/todo/Makefile.am	2007-01-21 22:05:23.000000000 -0500
-@@ -24,7 +24,7 @@
+--- evolution-2.11.3/calendar/conduits/todo/Makefile.am.fix-conduit-dir	2007-06-03 11:08:16.000000000 -0400
++++ evolution-2.11.3/calendar/conduits/todo/Makefile.am	2007-06-04 12:56:19.000000000 -0400
+@@ -25,7 +25,7 @@ e-todo.conduit: e-todo.conduit.in
  	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
  	    $< > $@
  
 -conduitdir = $(datadir)/gnome-pilot/conduits/
 +conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-todo-$(BASE_VERSION).conduit
+ conduit_DATA = e-todo.conduit
  
  BUILT_SOURCES = $(conduit_DATA)
---- evolution-2.9.5/calendar/conduits/todo/Makefile.in.fix-conduit-dir	2007-01-21 22:06:31.000000000 -0500
-+++ evolution-2.9.5/calendar/conduits/todo/Makefile.in	2007-01-21 22:06:39.000000000 -0500
-@@ -454,7 +454,7 @@
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la		 	\
+--- evolution-2.11.3/calendar/conduits/todo/Makefile.in.fix-conduit-dir	2007-06-04 07:36:51.000000000 -0400
++++ evolution-2.11.3/calendar/conduits/todo/Makefile.in	2007-06-04 12:56:28.000000000 -0400
+@@ -456,7 +456,7 @@ libetodo_conduit_la_LIBADD = \
+ 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
  	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
  
 -conduitdir = $(datadir)/gnome-pilot/conduits/
 +conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-todo-$(BASE_VERSION).conduit
+ conduit_DATA = e-todo.conduit
  BUILT_SOURCES = $(conduit_DATA)
  CLEANFILES = $(BUILT_SOURCES)
---- evolution-2.9.5/calendar/conduits/memo/Makefile.am.fix-conduit-dir	2007-01-03 10:34:54.000000000 -0500
-+++ evolution-2.9.5/calendar/conduits/memo/Makefile.am	2007-01-21 22:05:23.000000000 -0500
-@@ -24,7 +24,7 @@
+--- evolution-2.11.3/calendar/conduits/memo/Makefile.am.fix-conduit-dir	2007-06-03 11:08:16.000000000 -0400
++++ evolution-2.11.3/calendar/conduits/memo/Makefile.am	2007-06-04 12:56:49.000000000 -0400
+@@ -25,7 +25,7 @@ e-memo.conduit: e-memo.conduit.in
  	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
  	    $< > $@
  
 -conduitdir = $(datadir)/gnome-pilot/conduits/
 +conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-memo-$(BASE_VERSION).conduit
+ conduit_DATA = e-memo.conduit
  
  BUILT_SOURCES = $(conduit_DATA)
---- evolution-2.9.5/calendar/conduits/memo/Makefile.in.fix-conduit-dir	2007-01-21 22:06:46.000000000 -0500
-+++ evolution-2.9.5/calendar/conduits/memo/Makefile.in	2007-01-21 22:06:54.000000000 -0500
-@@ -454,7 +454,7 @@
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la		 	\
+--- evolution-2.11.3/calendar/conduits/memo/Makefile.in.fix-conduit-dir	2007-06-04 07:36:50.000000000 -0400
++++ evolution-2.11.3/calendar/conduits/memo/Makefile.in	2007-06-04 12:56:40.000000000 -0400
+@@ -456,7 +456,7 @@ libememo_conduit_la_LIBADD = \
+ 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
  	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
  
 -conduitdir = $(datadir)/gnome-pilot/conduits/
 +conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-memo-$(BASE_VERSION).conduit
+ conduit_DATA = e-memo.conduit
  BUILT_SOURCES = $(conduit_DATA)
  CLEANFILES = $(BUILT_SOURCES)
---- evolution-2.9.5/calendar/conduits/calendar/Makefile.am.fix-conduit-dir	2007-01-03 10:34:54.000000000 -0500
-+++ evolution-2.9.5/calendar/conduits/calendar/Makefile.am	2007-01-21 22:05:23.000000000 -0500
-@@ -24,7 +24,7 @@
+--- evolution-2.11.3/calendar/conduits/calendar/Makefile.am.fix-conduit-dir	2007-06-03 11:08:16.000000000 -0400
++++ evolution-2.11.3/calendar/conduits/calendar/Makefile.am	2007-06-04 12:57:02.000000000 -0400
+@@ -25,7 +25,7 @@ e-calendar.conduit: e-calendar.conduit.i
  	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
  	    $< > $@
  
 -conduitdir = $(datadir)/gnome-pilot/conduits/
 +conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-calendar-$(BASE_VERSION).conduit
+ conduit_DATA = e-calendar.conduit
  
  BUILT_SOURCES = $(conduit_DATA)
---- evolution-2.9.5/calendar/conduits/calendar/Makefile.in.fix-conduit-dir	2007-01-21 22:06:15.000000000 -0500
-+++ evolution-2.9.5/calendar/conduits/calendar/Makefile.in	2007-01-21 22:06:23.000000000 -0500
-@@ -456,7 +456,7 @@
- 	$(top_builddir)/widgets/misc/libemiscwidgets.la	 		\
+--- evolution-2.11.3/calendar/conduits/calendar/Makefile.in.fix-conduit-dir	2007-06-04 07:36:50.000000000 -0400
++++ evolution-2.11.3/calendar/conduits/calendar/Makefile.in	2007-06-04 12:57:11.000000000 -0400
+@@ -458,7 +458,7 @@ libecalendar_conduit_la_LIBADD = \
+ 	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
  	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
  
 -conduitdir = $(datadir)/gnome-pilot/conduits/
 +conduitdir = $(libdir)/gnome-pilot/conduits/
- conduit_DATA = e-calendar-$(BASE_VERSION).conduit
+ conduit_DATA = e-calendar.conduit
  BUILT_SOURCES = $(conduit_DATA)
  CLEANFILES = $(BUILT_SOURCES)

evolution-2.8.1-kill-ethread.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.6 -r 1.7 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- evolution-2.8.1-kill-ethread.patch	19 May 2007 00:56:12 -0000	1.6
+++ evolution-2.8.1-kill-ethread.patch	4 Jun 2007 20:07:28 -0000	1.7
@@ -1,6 +1,6 @@
---- evolution-2.11.2/mail/mail-send-recv.c.kill-ethread	2007-04-20 00:28:22.000000000 -0400
-+++ evolution-2.11.2/mail/mail-send-recv.c	2007-05-18 15:34:09.000000000 -0400
-@@ -778,23 +778,22 @@
+--- evolution-2.11.3/mail/mail-send-recv.c.kill-ethread	2007-06-03 11:08:08.000000000 -0400
++++ evolution-2.11.3/mail/mail-send-recv.c	2007-06-04 14:25:34.000000000 -0400
+@@ -764,23 +764,22 @@ receive_get_folder(CamelFilterDriver *d,
  /* ********************************************************************** */
  
  struct _refresh_folders_msg {
@@ -28,7 +28,7 @@
  	int i;
  	CamelFolder *folder;
  	CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-@@ -812,17 +811,14 @@
+@@ -802,17 +801,14 @@ refresh_folders_get (struct _mail_msg *m
  }
  
  static void
@@ -48,7 +48,7 @@
  	int i;
  
  	for (i=0;i<m->folders->len;i++)
-@@ -831,11 +827,12 @@
+@@ -821,11 +817,12 @@ refresh_folders_free (struct _mail_msg *
  	camel_object_unref(m->store);
  }
  
@@ -66,7 +66,7 @@
  };
  
  static void
-@@ -868,13 +865,13 @@
+@@ -858,13 +855,13 @@ receive_update_got_folderinfo(CamelStore
  
  		get_folders(store, folders, info);
  
@@ -82,9 +82,9 @@
  	} else {
  		receive_done ("", data);
  	}
---- evolution-2.11.2/mail/mail-component.c.kill-ethread	2007-05-13 13:41:10.000000000 -0400
-+++ evolution-2.11.2/mail/mail-component.c	2007-05-18 15:34:09.000000000 -0400
-@@ -1014,7 +1014,7 @@
+--- evolution-2.11.3/mail/mail-component.c.kill-ethread	2007-06-03 11:08:08.000000000 -0400
++++ evolution-2.11.3/mail/mail-component.c	2007-06-04 14:25:34.000000000 -0400
+@@ -1014,7 +1014,7 @@ impl_handleURI (PortableServer_Servant s
  		if (camel_url_get_param(url, "uid") != NULL) {
  			char *curi = em_uri_to_camel(uri);
  
@@ -93,8 +93,8 @@
  			g_free(curi);
  		} else {
  			g_warning("email uri's must include a uid parameter");
---- evolution-2.11.2/mail/mail-ops.c.kill-ethread	2007-04-18 06:17:32.000000000 -0400
-+++ evolution-2.11.2/mail/mail-ops.c	2007-05-18 15:34:09.000000000 -0400
+--- evolution-2.11.3/mail/mail-ops.c.kill-ethread	2007-06-01 03:08:56.000000000 -0400
++++ evolution-2.11.3/mail/mail-ops.c	2007-06-04 14:25:34.000000000 -0400
 @@ -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 */
@@ -104,7 +104,7 @@
  	
  	CamelFolder *source_folder; /* where they come from */
  	GPtrArray *source_uids;	/* uids to copy, or NULL == copy all */
-@@ -99,8 +99,8 @@
+@@ -99,8 +99,8 @@ struct _fetch_mail_msg {
  	void *data;
  };
  
@@ -115,7 +115,7 @@
  {
  	return g_strdup (_("Filtering Selected Messages"));
  }
-@@ -108,9 +108,8 @@
+@@ -108,9 +108,8 @@ em_filter_folder_element_describe (struc
  /* filter a folder, or a subset thereof, uses source_folder/source_uids */
  /* this is shared with fetch_mail */
  static void
@@ -126,7 +126,7 @@
  	CamelFolder *folder;
  	GPtrArray *uids, *folder_uids = NULL;
  	
-@@ -137,15 +136,15 @@
+@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct 
  	else
  		folder_uids = uids = camel_folder_get_uids (folder);
  	
@@ -145,7 +145,7 @@
  	camel_folder_thaw (folder);
  	
  	if (m->destination)
-@@ -161,15 +160,13 @@
+@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct 
  }
  
  static void
@@ -163,7 +163,7 @@
  	if (m->source_folder)
  		camel_object_unref (m->source_folder);
  	
-@@ -188,11 +185,12 @@
+@@ -188,11 +185,12 @@ em_filter_folder_element_free (struct _m
  	mail_session_flush_filter_log ();
  }
  
@@ -181,7 +181,7 @@
  };
  
  void
-@@ -202,7 +200,7 @@
+@@ -202,7 +200,7 @@ mail_filter_folder (CamelFolder *source_
  {
  	struct _filter_mail_msg *m;
  	
@@ -190,7 +190,7 @@
  	m->source_folder = source_folder;
  	camel_object_ref (source_folder);
  	m->source_uids = uids;
-@@ -221,7 +219,7 @@
+@@ -221,7 +219,7 @@ mail_filter_folder (CamelFolder *source_
  		camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification");
  	}
  	
@@ -199,7 +199,7 @@
  }
  
  /* convenience functions for it */
-@@ -260,17 +258,16 @@
+@@ -260,17 +258,16 @@ uid_cachename_hack (CamelStore *store)
  	return filename;
  }
  
@@ -221,7 +221,7 @@
  	int i;
  
  	if (m->cancel)
-@@ -283,20 +280,20 @@
+@@ -283,20 +280,20 @@ fetch_mail_fetch (struct _mail_msg *mm)
  	/* FIXME: this should support keep_on_server too, which would then perform a spool
  	   access thingy, right?  problem is matching raw messages to uid's etc. */
  	if (!strncmp (m->source_uri, "mbox:", 5)) {
@@ -247,7 +247,7 @@
  		
  		if (folder) {
  			/* this handles 'keep on server' stuff, if we have any new uid's to copy
-@@ -322,17 +319,17 @@
+@@ -322,17 +319,17 @@ fetch_mail_fetch (struct _mail_msg *mm)
  					camel_uid_cache_free_uids (cache_uids);
  					
  					fm->cache = cache;
@@ -268,7 +268,7 @@
  					/* not keep on server - just delete all the actual messages on the server */
  					for (i=0;i<folder_uids->len;i++) {
  						d(printf("force delete uid '%s'\n", (char *)folder_uids->pdata[i]));
-@@ -348,7 +345,7 @@
+@@ -348,7 +345,7 @@ fetch_mail_fetch (struct _mail_msg *mm)
  				camel_uid_cache_destroy (cache);
  				camel_folder_free_uids (folder, folder_uids);
  			} else {
@@ -277,7 +277,7 @@
  			}
  			
  			/* we unref the source folder here since we
-@@ -372,31 +369,28 @@
+@@ -372,31 +369,28 @@ fail:	
  }
  
  static void
@@ -318,7 +318,7 @@
  };
  
  /* ouch, a 'do everything' interface ... */
-@@ -409,7 +403,7 @@
+@@ -409,7 +403,7 @@ mail_fetch_mail (const char *source, int
  	struct _fetch_mail_msg *m;
  	struct _filter_mail_msg *fm;
  	
@@ -327,7 +327,7 @@
  	fm = (struct _filter_mail_msg *)m;
  	m->source_uri = g_strdup (source);
  	fm->delete = !keep;
-@@ -426,7 +420,7 @@
+@@ -426,7 +420,7 @@ mail_fetch_mail (const char *source, int
  	if (status)
  		camel_filter_driver_set_status_func (fm->driver, status, status_data);
  	
@@ -336,7 +336,7 @@
  }
  
  /* ********************************************************************** */
-@@ -657,7 +651,7 @@
[...3110 lines suppressed...]
-@@ -45,10 +45,6 @@
+--- evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread	2007-04-18 06:18:37.000000000 -0400
++++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.c	2007-06-04 14:25:34.000000000 -0400
+@@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate {
          GMutex *mutex;
  };
  
@@ -6258,7 +6455,7 @@
  #define d(x) x
  
  
-@@ -286,72 +282,12 @@
+@@ -286,72 +282,12 @@ alarm_notify_finalize (GObject *object)
  	g_mutex_free (priv->mutex);
  	g_free (priv);
  
@@ -6331,7 +6528,7 @@
  /**
   * alarm_notify_new:
   * 
-@@ -363,23 +299,10 @@
+@@ -363,23 +299,10 @@ alarm_msg_received(EThread *e, EMsg *msg
  AlarmNotify *
  alarm_notify_new (void)
  {
@@ -6359,9 +6556,9 @@
  }
  
  static void
---- evolution-2.11.2/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread	2007-05-09 00:14:46.000000000 -0400
-+++ evolution-2.11.2/calendar/gui/alarm-notify/alarm-queue.c	2007-05-18 15:34:09.000000000 -0400
-@@ -115,9 +115,6 @@
+--- evolution-2.11.3/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread	2007-06-01 03:09:22.000000000 -0400
++++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-queue.c	2007-06-04 14:25:34.000000000 -0400
+@@ -97,9 +97,6 @@ static int tray_blink_id = -1;
  static int tray_blink_state = FALSE;
  static AlarmNotify *an;
  
@@ -6371,7 +6568,7 @@
  /* Structure that stores a client we are monitoring */
  typedef struct {
  	/* Monitored client */
-@@ -199,6 +196,40 @@
+@@ -181,6 +178,40 @@ static void on_dialog_objs_removed_cb (E
  static void load_alarms_for_today (ClientAlarms *ca);
  static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data);
  
@@ -6412,7 +6609,7 @@
  /* Queues an alarm trigger for midnight so that we can load the next day's worth
   * of alarms.
   */
-@@ -237,47 +268,41 @@
+@@ -219,47 +250,41 @@ add_client_alarms_cb (gpointer key, gpoi
  }
  
  struct _midnight_refresh_msg {
@@ -6470,7 +6667,7 @@
  }
  
  /* Looks up a client in the client alarms hash table */
-@@ -636,6 +661,7 @@
+@@ -618,6 +643,7 @@ remove_comp (ClientAlarms *ca, ECalCompo
   * alarms.
   */
  struct _query_msg {
@@ -6478,7 +6675,7 @@
  	ECal *client;
  	GList *objects;
  	gpointer data;
-@@ -669,7 +695,7 @@
+@@ -651,7 +677,7 @@ duplicate_ecal (GList *in_list)
  }
  
  static void
@@ -6487,7 +6684,7 @@
  {
  	ClientAlarms *ca;
  	time_t from, day_end;
-@@ -678,13 +704,12 @@
+@@ -660,13 +686,12 @@ query_objects_changed_async (EThread *e,
  	icaltimezone *zone;
  	CompQueuedAlarms *cqa;
  	GList *l;
@@ -6504,7 +6701,7 @@
  	
  	from = config_data_get_last_notification_time ();
  	if (from == -1)
-@@ -773,43 +798,38 @@
+@@ -755,43 +780,38 @@ query_objects_changed_async (EThread *e,
  		comp = NULL;
  	}
  	g_list_free (objects);
@@ -6561,7 +6758,7 @@
  	
  	d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects)));
  	
-@@ -822,27 +842,22 @@
+@@ -804,27 +824,22 @@ query_objects_removed_async (EThread *e,
  	}
  
  	g_list_free (objects);
@@ -6598,7 +6795,7 @@
  }
  
  
-@@ -989,20 +1004,19 @@
+@@ -966,20 +981,19 @@ free_tray_icon_data (TrayIconData *tray_
  }
  
  static void
@@ -6623,7 +6820,7 @@
  	
  	e_cal_component_get_uid (tray_data->comp, &our_uid);
  	g_return_if_fail (our_uid && *our_uid);
-@@ -1020,37 +1034,33 @@
+@@ -997,37 +1011,33 @@ on_dialog_objs_removed_async (EThread *e
  			tray_data = NULL;
  		}
  	}
@@ -6673,7 +6870,7 @@
  	GList *list = tray_icons_list;
  
  	d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa));
-@@ -1089,28 +1099,25 @@
+@@ -1066,28 +1076,25 @@ tray_list_remove_cqa_async(EThread *e, A
  			gtk_tree_selection_select_iter (sel, &iter);
  		}
  	}
@@ -6711,7 +6908,7 @@
  {
  	GList *list = tray_icons_list;
  
-@@ -1140,55 +1147,50 @@
+@@ -1117,55 +1124,50 @@ tray_list_remove_async(EThread *e, Alarm
  		} else
  			list = list->next;
  	}	
@@ -6785,7 +6982,7 @@
  }
  
  static void
-@@ -1412,29 +1414,24 @@
+@@ -1372,29 +1374,24 @@ tray_icon_blink_cb (gpointer data)
  /* Add a new data to tray list */
  
  static void
@@ -6826,7 +7023,7 @@
  }
  
  /* Performs notification of a display alarm */
-@@ -1862,21 +1859,13 @@
+@@ -1791,21 +1788,13 @@ check_midnight_refresh (gpointer user_da
  	new_midnight = time_day_end_with_zone (time (NULL), zone);
  
  	if (new_midnight > midnight) {
@@ -6853,7 +7050,7 @@
  	}
  
  	return TRUE;
-@@ -2007,14 +1996,15 @@
+@@ -1936,14 +1925,15 @@ hash_ids (gpointer a)
  }
  
  struct _alarm_client_msg {
@@ -6872,7 +7069,7 @@
  
  	g_return_if_fail (alarm_queue_inited);
  	g_return_if_fail (client != NULL);
-@@ -2045,6 +2035,8 @@
+@@ -1974,6 +1964,8 @@ static void alarm_queue_add_async (EThre
  				  G_CALLBACK (cal_opened_cb),
  				  ca);
  	}	
@@ -6881,7 +7078,7 @@
  }
  
  /**
-@@ -2064,20 +2056,13 @@
+@@ -1993,20 +1985,13 @@ static void alarm_queue_add_async (EThre
  void
  alarm_queue_add_client (ECal *client)
  {
@@ -6907,7 +7104,7 @@
  }
  
  /* Removes a component an its alarms */
-@@ -2129,11 +2114,10 @@
+@@ -2058,11 +2043,10 @@ remove_client_alarms (ClientAlarms *ca)
   * Removes a calendar client from the alarm queueing system.
   **/
  static void
@@ -6921,7 +7118,7 @@
  
  	g_return_if_fail (alarm_queue_inited);
  	g_return_if_fail (client != NULL);
-@@ -2170,24 +2154,20 @@
+@@ -2099,24 +2083,20 @@ alarm_queue_remove_async (EThread *e, Al
  	g_free (ca);
  
  	g_hash_table_remove (client_alarms_hash, client);

evolution-2.9.1-kill-ememory.patch:

Index: evolution-2.9.1-kill-ememory.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution-2.9.1-kill-ememory.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-2.9.1-kill-ememory.patch	1 May 2007 15:57:42 -0000	1.2
+++ evolution-2.9.1-kill-ememory.patch	4 Jun 2007 20:07:28 -0000	1.3
@@ -56,7 +56,7 @@
 -		const unsigned char *subject;
 -		
 -		subject = (const unsigned char *) string;
--		while (!g_ascii_strncasecmp (subject, "Re:", 3)) {
+-		while (!g_ascii_strncasecmp ((char *)subject, "Re:", 3)) {
 -			subject += 3;
 -			
 -			/* jump over any spaces */


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.263
retrieving revision 1.264
diff -u -r1.263 -r1.264
--- evolution.spec	31 May 2007 19:21:02 -0000	1.263
+++ evolution.spec	4 Jun 2007 20:07:28 -0000	1.264
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.11.2
-Release: 2%{?dist}
+Version: 2.11.3
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -95,9 +95,6 @@
 # RH bug #178295 / GNOME bug #348638
 Patch21: evolution-2.7.4-deleting-preedit-buffer.patch
 
-# RH bug #202289
-Patch22: evolution-2.7.92-fix-prgname.patch
-
 # RH bug #161885 / GNOME bug #309166
 Patch23: evolution-2.8.0-indic-cursor-movement.patch
 
@@ -134,14 +131,8 @@
 # GNOME bug #417999
 Patch34: evolution-2.10.0-e-source-combo-box.patch
 
-# RH bug #235878 / GNOME bug #386503
-Patch35: evolution-2.10.1-fix-help.patch
-
-# RH bug #238155 / GNOME bug #427232
-Patch36: evolution-2.10.1-check-uri-before-strcmp.patch
-
-# RH bug #240147 / GNOME bug #335241
-Patch37: evolution-2.10.1-send-recv-dialog.patch
+# Upstream really needs to use -Werror-implicit-function-declaration.
+Patch35: evolution-2.11.3-implicit-function-declaration.patch
 
 ## Dependencies ###
 
@@ -270,7 +261,6 @@
 %patch19 -p1 -b .candidate-window-position-calendar
 %patch20 -p1 -b .replicated-cjk-input
 %patch21 -p1 -b .deleting-preedit-buffer
-%patch22 -p1 -b .fix-prgname
 %patch23 -p1 -b .indic-cursor-movement
 %patch24 -p1 -b .fix-indic-printing
 %patch25 -p1 -b .kill-ethread
@@ -283,9 +273,7 @@
 %patch32 -p1 -b .view-message-source
 %patch33 -p1 -b .e-passwords
 %patch34 -p1 -b .e-source-combo-box
-%patch35 -p1 -b .fix-help
-%patch36 -p1 -b .check-uri-before-strcmp
-%patch37 -p1 -b .send-recv-dialog
+%patch35 -p1 -b .implicit-function-declaration
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -428,9 +416,6 @@
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys
 rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime
 
-# evolution link
-ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution
-
 for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
     sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
 done
@@ -442,12 +427,13 @@
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin-%{evo_major}.schemas > /dev/null
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null
 
 %postun
 /sbin/ldconfig
@@ -463,15 +449,15 @@
 %doc AUTHORS COPYING ChangeLog NEWS README
 
 # GConf schemas:
-%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas 
-%{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas
-%{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas
-%{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas
-%{_sysconfdir}/gconf/schemas/bogo-junk-plugin-%{evo_major}.schemas
-%{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas
+%{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas
+%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas 
+%{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas
+%{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas
+%{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas
+%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas
+%{_sysconfdir}/gconf/schemas/evolution-mail.schemas
 
-# The main executable and a symlink:
-%{_bindir}/evolution-%{evo_major}
+# The main executable
 %{_bindir}/evolution
 
 # Desktop files:
@@ -506,11 +492,11 @@
 %{_datadir}/evolution/%{evo_major}
 
 # Bonobo components:
-%{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook_%{evo_major}.server
-%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_%{evo_major}.server
-%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%{evo_major}.server
-%{_libdir}/bonobo/servers/GNOME_Evolution_Mail_%{evo_major}.server
-%{_libdir}/bonobo/servers/GNOME_Evolution_Shell_%{evo_major}.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_Mail.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_Shell.server
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution/%{evo_major}
 %dir %{_libdir}/evolution/%{evo_major}/components
@@ -556,16 +542,16 @@
 %dir %{_libdir}/evolution/%{evo_major}/conduits
 
 %{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so
-%{_libdir}/gnome-pilot/conduits/e-address-%{evo_major}.conduit
+%{_libdir}/gnome-pilot/conduits/e-address.conduit
 
 %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so
-%{_libdir}/gnome-pilot/conduits/e-calendar-%{evo_major}.conduit
+%{_libdir}/gnome-pilot/conduits/e-calendar.conduit
 
 %{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so
-%{_libdir}/gnome-pilot/conduits/e-memo-%{evo_major}.conduit
+%{_libdir}/gnome-pilot/conduits/e-memo.conduit
 
 %{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so
-%{_libdir}/gnome-pilot/conduits/e-todo-%{evo_major}.conduit
+%{_libdir}/gnome-pilot/conduits/e-todo.conduit
 %endif
 
 # The plugin directory:
@@ -695,8 +681,8 @@
 %files devel
 %defattr(-, root, root)
 %{_includedir}/evolution-%{evo_major}
-%{_libdir}/pkgconfig/evolution-plugin-%{evo_major}.pc
-%{_libdir}/pkgconfig/evolution-shell-%{evo_major}.pc
+%{_libdir}/pkgconfig/evolution-plugin.pc
+%{_libdir}/pkgconfig/evolution-shell.pc
 %{_libdir}/evolution/%{evo_major}/libeabutil.so
 %{_libdir}/evolution/%{evo_major}/libeconduit.so
 %{_libdir}/evolution/%{evo_major}/libecontacteditor.so
@@ -721,6 +707,14 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Jun 04 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.3-1.fc8
+- Update to 2.11.3
+- Evolution no longer has versioned file names.
+- Remove patch for RH bug #202289 (fixed upstream).
+- Remove patch for RH bug #235878 (fixed upstream).
+- Remove patch for RH bug #238155 (fixed upstream).
+- Remove patch for RH bug #240147 (fixed upstream).
+
 * Thu May 31 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.2-2.fc8
 - Evolution no longer requires libgnomeprint[ui].
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	19 May 2007 00:56:12 -0000	1.70
+++ sources	4 Jun 2007 20:07:28 -0000	1.71
@@ -1 +1 @@
-7f684d90627bacd6e4a7997592112484  evolution-2.11.2.tar.bz2
+4aa1a1a4b4cf51d64eb259ae3769c8d0  evolution-2.11.3.tar.bz2


--- evolution-2.10.1-check-uri-before-strcmp.patch DELETED ---


--- evolution-2.10.1-fix-help.patch DELETED ---


--- evolution-2.10.1-send-recv-dialog.patch DELETED ---


--- evolution-2.7.92-fix-prgname.patch DELETED ---


