[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/evolution/devel evolution-2.10.1-calendar-component.patch, NONE, 1.1 evolution.spec, 1.254, 1.255



Author: mbarnes

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

Modified Files:
	evolution.spec 
Added Files:
	evolution-2.10.1-calendar-component.patch 
Log Message:

* Mon May 07 2007 Matthew Barnes <mbarnes redhat com> - 2.10.1-13.fc7
- Add patch for RH bug #238155 (crash on startup).


evolution-2.10.1-calendar-component.patch:

--- NEW FILE evolution-2.10.1-calendar-component.patch ---
--- evolution-2.10.1/calendar/gui/calendar-component.c.calendar-component	2007-05-07 14:07:16.000000000 -0400
+++ evolution-2.10.1/calendar/gui/calendar-component.c	2007-05-07 14:11:48.000000000 -0400
@@ -210,7 +210,13 @@
 		GSList *s;
 		for (s = sources; s; s = s->next) {
 			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+			const gchar *relative_uri;
+
+			g_assert (source != NULL);
+			relative_uri = e_source_peek_relative_uri (source);
+			if (relative_uri == NULL)
+				continue;
+			if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
 				personal_source = source;
 				break;
 			}


Index: evolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- evolution.spec	3 May 2007 21:08:58 -0000	1.254
+++ evolution.spec	7 May 2007 19:51:12 -0000	1.255
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -173,6 +173,9 @@
 # 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-calendar-component.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -330,6 +333,7 @@
 %patch50 -p1 -b .fix-uri-handling
 %patch51 -p1 -b .en_CA-attribution-format
 %patch52 -p1 -b .e-attachment-bar
+%patch53 -p1 -b .calendar-component
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -751,6 +755,9 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon May 07 2007 Matthew Barnes <mbarnes redhat com> - 2.10.1-13.fc7
+- Add patch for RH bug #238155 (crash on startup).
+
 * Tue May 01 2007 Matthew Barnes <mbarnes redhat com> - 2.10.1-12.fc7
 - Add patch for RH bug #238551 (incorrect attachment count).
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]