rpms/evolution/F-7 .cvsignore, 1.69, 1.70 evolution-2.10.1-saving-attachments.patch, 1.1, 1.2 evolution.spec, 1.261, 1.262 sources, 1.69, 1.70 evolution-2.10.1-e-attachment-bar.patch, 1.1, NONE evolution-2.10.1-fix-help.patch, 1.1, NONE evolution-2.7.92-fix-prgname.patch, 1.1, NONE

Matthew Barnes (mbarnes) fedora-extras-commits at redhat.com
Tue May 29 04:10:04 UTC 2007


Author: mbarnes

Update of /cvs/pkgs/rpms/evolution/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7382

Modified Files:
	.cvsignore evolution-2.10.1-saving-attachments.patch 
	evolution.spec sources 
Removed Files:
	evolution-2.10.1-e-attachment-bar.patch 
	evolution-2.10.1-fix-help.patch 
	evolution-2.7.92-fix-prgname.patch 
Log Message:

* Mon May 28 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.2-1.fc7
- Update to 2.10.2
- Remove patch for RH bug #202289 (fixed upstream).
- Remove patch for RH bug #235878 (fixed upstream).
- Remove patch for RH bug #238551 (fixed upstream).



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-7/.cvsignore,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- .cvsignore	9 Apr 2007 18:09:26 -0000	1.69
+++ .cvsignore	29 May 2007 04:09:29 -0000	1.70
@@ -1 +1 @@
-evolution-2.10.1.tar.bz2
+evolution-2.10.2.tar.bz2

evolution-2.10.1-saving-attachments.patch:

Index: evolution-2.10.1-saving-attachments.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-7/evolution-2.10.1-saving-attachments.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.10.1-saving-attachments.patch	14 Apr 2007 20:46:09 -0000	1.1
+++ evolution-2.10.1-saving-attachments.patch	29 May 2007 04:09:29 -0000	1.2
@@ -1,5 +1,5 @@
---- evolution-2.10.1/mail/em-utils.c.saving-attachments	2007-04-14 14:25:40.000000000 -0400
-+++ evolution-2.10.1/mail/em-utils.c	2007-04-14 15:08:50.000000000 -0400
+--- evolution-2.10.2/mail/em-utils.c.saving-attachments	2007-05-28 23:24:04.000000000 -0400
++++ evolution-2.10.2/mail/em-utils.c	2007-05-28 23:26:18.000000000 -0400
 @@ -354,28 +354,23 @@
  
  /* Saving messages... */
@@ -13,13 +13,13 @@
 -	
 -	if (response == GTK_RESPONSE_OK) {
 -		uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (filesel));
-+	const gchar *filename;
- 
+-
 -		if (!e_file_can_save((GtkWindow *)filesel, uri)) {
 -			g_free(uri);
 -			return;
 -		}
--
++	const gchar *filename;
+ 
 -		e_file_update_save_path(gtk_file_chooser_get_current_folder_uri(
 -					GTK_FILE_CHOOSER(filesel)), TRUE);
 -		/* FIXME: popup error if it fails? */
@@ -42,28 +42,17 @@
  }
  
  /**
-@@ -387,83 +382,78 @@
+@@ -387,73 +382,78 @@
   * Saves a mime part to disk (prompting the user for filename).
   **/
  void
 -em_utils_save_part(GtkWidget *parent, const char *prompt, CamelMimePart *part)
 +em_utils_save_part (GtkWidget *parent, const char *prompt, CamelMimePart *part)
- {
--	const char *name;
--	GtkWidget *filesel;
++  {
 +	GtkWidget *file_chooser;
 +	const gchar *filename;
 +	gchar *uri = NULL;
- 
--	name = camel_mime_part_get_filename(part);
--	if (name == NULL) {
--		if (CAMEL_IS_MIME_MESSAGE(part)) {
--			name = camel_mime_message_get_subject((CamelMimeMessage *)part);
--			if (name == NULL)
--				name = _("message");
--		} else {
--			name = _("attachment");
--		}
++  
 +	filename = emu_save_get_filename_for_part (part);
 +
 +	file_chooser = e_file_get_save_filesel (
@@ -78,12 +67,8 @@
 +	if (!e_file_can_save (GTK_WINDOW (file_chooser), uri)) {
 +		g_warning ("Unable to save %s", uri);
 +		goto exit;
- 	}
- 
--	filesel = e_file_get_save_filesel(parent, prompt, name, GTK_FILE_CHOOSER_ACTION_SAVE);
--	camel_object_ref(part);
--	g_signal_connect (filesel, "response", G_CALLBACK (emu_save_part_response), part);
--	gtk_widget_show (filesel);
++  	}
++  
 +	e_file_update_save_path (
 +		gtk_file_chooser_get_current_folder_uri (
 +		GTK_FILE_CHOOSER (file_chooser)), TRUE);
@@ -93,17 +78,45 @@
 +exit:
 +	gtk_widget_destroy (file_chooser);
 +	g_free (uri);
- }
- 
--static void
--emu_save_parts_response (GtkWidget *filesel, int response, GSList *parts)
++  }
++  
 +void
 +em_utils_save_parts (GtkWidget *parent, const gchar *prompt, GSList *parts)
  {
+-	const char *name;
+-	GtkWidget *filesel;
++	GtkWidget *file_chooser;
++	gchar *path_uri;
++	GSList *iter;
+ 
+-	name = camel_mime_part_get_filename(part);
+-	if (name == NULL) {
+-		if (CAMEL_IS_MIME_MESSAGE(part)) {
+-			name = camel_mime_message_get_subject((CamelMimeMessage *)part);
+-			if (name == NULL)
+-				name = _("message");
+-		} else {
+-			name = _("attachment");
+-		}
+-	}
++	file_chooser = e_file_get_save_filesel (
++		parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ 
+-	filesel = e_file_get_save_filesel(parent, prompt, name, GTK_FILE_CHOOSER_ACTION_SAVE);
+-	camel_object_ref(part);
+-	g_signal_connect (filesel, "response", G_CALLBACK (emu_save_part_response), part);
+-	gtk_widget_show (filesel);
+-}
++	if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK)
++		goto exit;
+ 
+-static void
+-emu_save_parts_response (GtkWidget *filesel, int response, GSList *parts)
+-{
 -        GSList *selected;
 -		char *uri = NULL;
 -        if (response == GTK_RESPONSE_OK) {
--		uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (filesel));
+-		uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER (filesel));
 -                e_file_update_save_path(uri, FALSE);
 -
 -                for ( selected = parts; selected != NULL; selected = selected->next) {
@@ -132,30 +145,20 @@
 -				mail_save_part(part, file_path, NULL, NULL, FALSE);
 -			else
 -				g_warning ("Could not save %s. File already exists", file_path);
-+        GtkWidget *file_chooser;
-+	gchar *path_uri;
-+	GSList *iter;
-+
-+        file_chooser = e_file_get_save_filesel (
-+		parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-+
-+	if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK)
-+		goto exit;
-+
 +	path_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser));
 +
 +	e_file_update_save_path (path_uri, FALSE);
- 
--			g_free (file_path);
--			g_free (safe_name);
--                }
++  
 +	for (iter = parts; iter != NULL; iter = iter->next) {
 +		CamelMimePart *part = iter->data;
 +		const gchar *filename;
 +		gchar *uri;
-+
+ 
+-			g_free (file_path);
+-			g_free (safe_name);
+-                }
 +		filename = emu_save_get_filename_for_part (part);
-+
+ 
 +		uri = g_build_path ("/", path_uri, filename, NULL);
 +
 +		/* XXX Would be nice to mention _why_ we can't save. */
@@ -163,31 +166,23 @@
 +			mail_save_part (part, uri, NULL, NULL, FALSE);
 +		else
 +			g_warning ("Unable to save %s", uri);
- 
++  
  		g_free (uri);
 -        }
 -	
 -	g_slist_free (parts);
 -	gtk_widget_destroy((GtkWidget *)filesel);
--}
 +	}
- 
--void
--em_utils_save_parts (GtkWidget *parent, const char *prompt, GSList * parts)
--{
--        GtkWidget *filesel;
++  
 +	g_free (path_uri);
- 
--        filesel = e_file_get_save_filesel (parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
--        g_signal_connect (filesel, "response", G_CALLBACK (emu_save_parts_response), parts);
--        gtk_widget_show (filesel);
++  
 +exit:
 +	gtk_widget_destroy (file_chooser);
  }
  
- 
---- evolution-2.10.1/mail/em-format-html-display.c.saving-attachments	2007-04-14 14:25:40.000000000 -0400
-+++ evolution-2.10.1/mail/em-format-html-display.c	2007-04-14 15:08:50.000000000 -0400
+ void
+--- evolution-2.10.2/mail/em-format-html-display.c.saving-attachments	2007-05-28 23:24:04.000000000 -0400
++++ evolution-2.10.2/mail/em-format-html-display.c	2007-05-28 23:24:05.000000000 -0400
 @@ -2099,12 +2099,24 @@
  }
  


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-7/evolution.spec,v
retrieving revision 1.261
retrieving revision 1.262
diff -u -r1.261 -r1.262
--- evolution.spec	16 May 2007 21:08:37 -0000	1.261
+++ evolution.spec	29 May 2007 04:09:29 -0000	1.262
@@ -46,8 +46,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.10.1
-Release: 17%{?dist}
+Version: 2.10.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -101,9 +101,6 @@
 # RH bug #178295 / GNOME bug #348638
 Patch24: evolution-2.7.4-deleting-preedit-buffer.patch
 
-# RH bug #202289
-Patch25: evolution-2.7.92-fix-prgname.patch
-
 # RH bug #161885 / GNOME bug #309166
 Patch26: evolution-2.8.0-indic-cursor-movement.patch
 
@@ -158,9 +155,6 @@
 # GNOME bug #418971
 Patch47: evolution-2.10.0-drop-old-glib-support.patch
 
-# RH bug #235878 / GNOME bug #386503
-Patch48: evolution-2.10.1-fix-help.patch
-
 # RH bug #234315 / GNOME bug #423766
 Patch49: evolution-2.10.1-saving-attachments.patch
 
@@ -170,9 +164,6 @@
 # RH bug #236399 / GNOME bug #434019
 Patch51: evolution-2.10.1-en_CA-attribution-format.patch
 
-# RH bug #238551 / GNOME bug #434981
-Patch52: evolution-2.10.1-e-attachment-bar.patch
-
 # RH bug #238155 / GNOME bug #427232
 Patch53: evolution-2.10.1-check-uri-before-strcmp.patch
 
@@ -312,7 +303,6 @@
 %patch22 -p1 -b .filter-datespec
 %patch23 -p1 -b .replicated-cjk-input
 %patch24 -p1 -b .deleting-preedit-buffer
-%patch25 -p1 -b .fix-prgname
 %patch26 -p1 -b .indic-cursor-movement
 %patch29 -p1 -b .fix-indic-printing
 %patch31 -p1 -b .kill-ethread
@@ -331,11 +321,9 @@
 %patch45 -p1 -b .shell-main-cleanups
 %patch46 -p1 -b .use-glib-i18n
 %patch47 -p1 -b .drop-old-glib-support
-%patch48 -p1 -b .fix-help
 %patch49 -p1 -b .saving-attachments
 %patch50 -p1 -b .fix-uri-handling
 %patch51 -p1 -b .en_CA-attribution-format
-%patch52 -p1 -b .e-attachment-bar
 %patch53 -p1 -b .check-uri-before-strcmp
 %patch54 -p1 -b .send-recv-dialog
 
@@ -759,6 +747,12 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon May 28 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.2-1.fc7
+- Update to 2.10.2
+- Remove patch for RH bug #202289 (fixed upstream).
+- Remove patch for RH bug #235878 (fixed upstream).
+- Remove patch for RH bug #238551 (fixed upstream).
+
 * Wed May 16 2007 Matthew Barnes <mbarnes at redhat.com> - 2.10.1-17.fc7
 - Revise patch for GNOME bug #362638 to fix RH bug #237206
   (certificate prompt causes crash, again).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/F-7/sources,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- sources	9 Apr 2007 18:09:26 -0000	1.69
+++ sources	29 May 2007 04:09:29 -0000	1.70
@@ -1 +1 @@
-16051c6cbb617cb04665e402566e0976  evolution-2.10.1.tar.bz2
+4b495be7f5e146ce7b5807134586336e  evolution-2.10.2.tar.bz2


--- evolution-2.10.1-e-attachment-bar.patch DELETED ---


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


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




More information about the fedora-extras-commits mailing list