rpms/evolution/devel evolution-2.9.2-optional-participant.patch, 1.1, 1.2 evolution.spec, 1.216, 1.217

[fedora-cvs-commits at redhat.com]

Author: mbarnes

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

Modified Files:
	evolution-2.9.2-optional-participant.patch evolution.spec 
Log Message:

* Tue Dec 12 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.3-3.fc7
- Revise patch for RH bug #215466 to also fix RH bug #218589.


evolution-2.9.2-optional-participant.patch:
 e-meeting-list-view.c |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

Index: evolution-2.9.2-optional-participant.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.9.2-optional-participant.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.9.2-optional-participant.patch	28 Nov 2006 21:35:13 -0000	1.1
+++ evolution-2.9.2-optional-participant.patch	13 Dec 2006 03:46:24 -0000	1.2
@@ -1,5 +1,14 @@
---- evolution-2.9.2/calendar/gui/e-meeting-list-view.c.optional-participant	2006-10-25 23:00:41.000000000 -0400
-+++ evolution-2.9.2/calendar/gui/e-meeting-list-view.c	2006-11-28 14:55:49.000000000 -0500
+--- evolution-2.9.3/calendar/gui/e-meeting-list-view.c.optional-participant	2006-10-25 23:00:41.000000000 -0400
++++ evolution-2.9.3/calendar/gui/e-meeting-list-view.c	2006-12-12 21:52:23.000000000 -0500
+@@ -234,7 +234,7 @@
+ 		case ICAL_ROLE_NONPARTICIPANT:
+ 			return 3;
+ 		default:
+-			return 4;
++			return 3;
+ 	}
+ }
+ 
 @@ -435,7 +435,20 @@
  static void
  role_edited_cb (GtkCellRenderer *renderer, const gchar *path, const gchar *text, GtkTreeView *view)


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- evolution.spec	12 Dec 2006 12:08:23 -0000	1.216
+++ evolution.spec	13 Dec 2006 03:46:24 -0000	1.217
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 2.9.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -143,7 +143,7 @@
 # http://mail.gnome.org/archives/evolution-patches/2006-August/msg00083.html
 Patch36: evolution-2.9.2-pilot-link-0.12.patch
 
-# RH bug #215466 / GNOME bug #377511
+# RH bug #215466 / RH bug #218589 / GNOME bug #377511
 Patch37: evolution-2.9.2-optional-participant.patch
 
 # GNOME bug #382431
@@ -728,6 +728,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Tue Dec 12 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.3-3.fc7
+- Revise patch for RH bug #215466 to also fix RH bug #218589.
+
 * Mon Dec 11 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.3-2.fc7
 - Add patch for RH bug #215467 (missing meeting participants).