rpms/evolution/devel evolution-2.7.92-fix-prgname.patch, NONE, 1.1 evolution-2.7.92-fix-edit-copy.patch, 1.1, 1.2 evolution.spec, 1.186, 1.187

[fedora-cvs-commits at redhat.com]

Author: mbarnes

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

Modified Files:
	evolution-2.7.92-fix-edit-copy.patch evolution.spec 
Added Files:
	evolution-2.7.92-fix-prgname.patch 
Log Message:

* Mon Aug 28 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-6.fc6
- Add another hunk to the patch for RH bug #201541.
- Add patch for RH bug #202289.


evolution-2.7.92-fix-prgname.patch:
 main.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE evolution-2.7.92-fix-prgname.patch ---
--- evolution-2.7.92/shell/main.c.fix-prgname	2006-08-28 11:04:44.000000000 -0400
+++ evolution-2.7.92/shell/main.c	2006-08-28 11:04:56.000000000 -0400
@@ -516,7 +516,7 @@
 
 	g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE);
 
-	program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
+	program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, 
 				      GNOME_PROGRAM_STANDARD_PROPERTIES,
 				      GNOME_PARAM_GOPTION_CONTEXT, context,
 				      GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"),

evolution-2.7.92-fix-edit-copy.patch:
 em-folder-view.c |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

Index: evolution-2.7.92-fix-edit-copy.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.7.92-fix-edit-copy.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.7.92-fix-edit-copy.patch	28 Aug 2006 11:46:25 -0000	1.1
+++ evolution-2.7.92-fix-edit-copy.patch	28 Aug 2006 17:23:31 -0000	1.2
@@ -1,5 +1,5 @@
---- evolution-2.7.92/mail/em-folder-view.c.fix-edit-copy	2006-08-28 06:36:52.000000000 -0400
-+++ evolution-2.7.92/mail/em-folder-view.c	2006-08-28 06:37:22.000000000 -0400
+--- evolution-2.7.92/mail/em-folder-view.c.fix-edit-copy	2006-08-28 11:11:35.000000000 -0400
++++ evolution-2.7.92/mail/em-folder-view.c	2006-08-28 11:55:26.000000000 -0400
 @@ -140,7 +140,7 @@
  static void emfv_on_url(EMFolderView *emfv, const char *uri, const char *nice_uri);
  
@@ -17,7 +17,21 @@
  #ifdef ENABLE_PROFILING
  	g_signal_connect(emfv->preview, "complete", G_CALLBACK (emfv_format_complete), emfv);
  #endif
-@@ -2877,3 +2878,15 @@
+@@ -1333,8 +1334,12 @@
+ emfv_select_all_text(BonoboUIComponent *uid, void *data, const char *path)
+ {
+ 	EMFolderView *emfv = data;
+-
++	gboolean selected;
++	
+ 	gtk_html_select_all (((EMFormatHTML *)emfv->preview)->html);
++	selected = gtk_html_command (((EMFormatHTML *)emfv->preview)->html, "is-selection-active");
++	bonobo_ui_component_set_prop(emfv->uic, "/commands/EditCopy", "sensitive", selected?"1":"0", NULL);	
++	
+ }
+ 
+ static void
+@@ -2877,3 +2882,15 @@
  	
  	g_free (nice_url);
  }


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- evolution.spec	28 Aug 2006 11:46:25 -0000	1.186
+++ evolution.spec	28 Aug 2006 17:23:31 -0000	1.187
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 2.7.92
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -135,6 +135,9 @@
 # RH bug #201541 / Gnome.org bug #336983
 Patch37: evolution-2.7.92-fix-edit-copy.patch
 
+# RH bug #202289
+Patch38: evolution-2.7.92-fix-prgname.patch
+
 ### Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -274,6 +277,7 @@
 %patch35 -p1 -b .deprecated-glib
 %patch36 -p1 -b .deprecated-gdk
 %patch37 -p1 -b .fix-edit-copy
+%patch38 -p1 -b .fix-prgname
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -664,6 +668,10 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Aug 28 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-6.fc6
+- Add another hunk to the patch for RH bug #201541.
+- Add patch for RH bug #202289.
+
 * Mon Aug 28 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-5.fc6
 - Add patch for RH bug #201541.