rpms/evolution/devel evolution-2.5.4-fix-missing-declarations.patch, NONE, 1.1 evolution-2.5.4-move-autosave-file.patch, NONE, 1.1 .cvsignore, 1.40, 1.41 evolution.spec, 1.107, 1.108 sources, 1.40, 1.41 evolution-2.2.2-move-autosave-file.patch, 1.2, NONE

Wed Jan 4 06:07:55 UTC 2006

Author: dmalcolm

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

Modified Files:
	.cvsignore evolution.spec sources 
Added Files:
	evolution-2.5.4-fix-missing-declarations.patch 
	evolution-2.5.4-move-autosave-file.patch 
Removed Files:
	evolution-2.2.2-move-autosave-file.patch 
Log Message:
* Tue Jan  3 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.4-1
- 2.5.4
- update patch 107 to track underlying code changes; rename from
  evolution-2.2.2-move-autosave-file.patch to
  evolution-2.5.4-move-autosave-file.patch
- added patch to fix more missing declarations (patch 805)
- added files for publish-calendar plugin



evolution-2.5.4-fix-missing-declarations.patch:
 calendar/gui/e-meeting-list-view.c           |    1 +
 mail/mail-tools.c                            |    2 +-
 plugins/publish-calendar/publish-format-fb.c |    1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE evolution-2.5.4-fix-missing-declarations.patch ---
--- evolution-2.5.4/calendar/gui/e-meeting-list-view.c.include_itip_utils	2006-01-04 00:15:42.000000000 -0500
+++ evolution-2.5.4/calendar/gui/e-meeting-list-view.c	2006-01-04 00:15:56.000000000 -0500
@@ -45,6 +45,7 @@
 #include <misc/e-cell-renderer-combo.h>
 #include <libebook/e-destination.h>
 #include "e-select-names-renderer.h"
+#include "itip-utils.h"
 
 struct _EMeetingListViewPrivate {
 	EMeetingStore *store;
--- evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c.include_itip_utils	2006-01-04 00:33:09.000000000 -0500
+++ evolution-2.5.4/plugins/publish-calendar/publish-format-fb.c	2006-01-04 00:33:24.000000000 -0500
@@ -27,6 +27,7 @@
 #include <libedataserver/e-source-list.h>
 #include <libecal/e-cal.h>
 #include <libecal/e-cal-util.h>
+#include <libecal/e-cal-time-util.h>
 #include <calendar/common/authentication.h>
 #include "publish-format-fb.h"
 
--- evolution-2.5.4/mail/mail-tools.c.include_itip_utils	2006-01-04 00:23:48.000000000 -0500
+++ evolution-2.5.4/mail/mail-tools.c	2006-01-04 00:25:21.000000000 -0500
@@ -100,7 +100,7 @@
 	return trash;
 }
 
-#if 0
+#if 1
 /* Not used */
 
 static char *

evolution-2.5.4-move-autosave-file.patch:
 e-msg-composer.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE evolution-2.5.4-move-autosave-file.patch ---
--- evolution-2.5.4/composer/e-msg-composer.c.move-autosave-file	2006-01-02 06:38:57.000000000 -0500
+++ evolution-2.5.4/composer/e-msg-composer.c	2006-01-03 23:15:32.000000000 -0500
@@ -1483,7 +1483,8 @@
 	gint len = strlen (AUTOSAVE_SEED);
 	gint load = FALSE;
 	
-	dir = g_dir_open (g_get_home_dir(), 0, NULL);
+	char *dirname = g_strdup_printf ("%s/.evolution", g_get_home_dir());
+	dir = g_dir_open (dirname, 0, NULL);
 	if (!dir) {
 		return;
 	}
@@ -1492,7 +1493,7 @@
 		if ((!strncmp (dname, AUTOSAVE_SEED, len - 6))
 		    && (strlen (dname) == len)
 		    && (!autosave_is_owned (am, dname))) {
-			char *filename =  g_strdup_printf ("%s/%s", g_get_home_dir(), dname);
+			char *filename =  g_strdup_printf ("%s/%s", dirname, dname);
 			struct stat st;
 		
 			/*
@@ -1509,6 +1510,7 @@
 	}
 	
 	g_dir_close (dir);
+	g_free (dirname);
 	
 	if (match != NULL)
 		load = e_error_run(parent, "mail-composer:recover-autosave", NULL) == GTK_RESPONSE_YES;
@@ -1558,7 +1560,7 @@
 {
 	EMsgComposerPrivate *p = composer->priv;
 	if (p->autosave_file == NULL) {
-		p->autosave_file = g_strdup_printf ("%s/%s", g_get_home_dir(), AUTOSAVE_SEED);
+		p->autosave_file = g_strdup_printf ("%s/.evolution/%s", g_get_home_dir(), AUTOSAVE_SEED);
 		p->autosave_fd = g_mkstemp (p->autosave_file);
 		return TRUE;
 	}


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- .cvsignore	19 Dec 2005 21:09:00 -0000	1.40
+++ .cvsignore	4 Jan 2006 06:07:52 -0000	1.41
@@ -1 +1 @@
-evolution-2.5.3.tar.bz2
+evolution-2.5.4.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- evolution.spec	19 Dec 2005 21:59:47 -0000	1.107
+++ evolution.spec	4 Jan 2006 06:07:52 -0000	1.108
@@ -30,7 +30,7 @@
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 Name: evolution
-Version: 2.5.3
+Version: 2.5.4
 Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -57,7 +57,7 @@
 Patch106: evolution-2.2.2-commit-enter-on-calendar.patch
 
 # Move autosave file
-Patch107: evolution-2.2.2-move-autosave-file.patch
+Patch107: evolution-2.5.4-move-autosave-file.patch
 
 # Fix for RH bug 150458:
 Patch108: evolution-2.3.5.1-fix-150458.patch
@@ -89,6 +89,7 @@
 Patch803: evolution-2.5.2-no-gnome-common.patch
 
 Patch804: evolution-2.4.1-fix-missing-declarations.patch
+Patch805: evolution-2.5.4-fix-missing-declarations.patch
 
 Summary: GNOME's next-generation groupware suite
 Group: Applications/Productivity
@@ -216,6 +217,7 @@
 %patch802 -p1 -b .fix-conduit-dir
 %patch803 -p1 -b .no-gnome-common
 %patch804 -p1 -b .fix-missing-declarations
+%patch805 -p1 -b .fix-missing-declarations-2-5-4
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -479,6 +481,12 @@
 %{evo_plugin_dir}/org-gnome-evolution-hula-account-setup.eplug
 %{evo_plugin_dir}/liborg-gnome-evolution-hula-account-setup.so
 
+%{evo_plugin_dir}/org-gnome-publish-calendar.eplug
+%{evo_plugin_dir}/liborg-gnome-publish-calendar.so
+%{evo_plugin_dir}/org-gnome-publish-calendar.xml
+%{evo_plugin_dir}/publish-calendar.glade
+
+
 %files devel
 %defattr(-, root, root)
 %{_includedir}/evolution-%{evo_major}
@@ -486,6 +494,14 @@
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Tue Jan  3 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.4-1
+- 2.5.4
+- update patch 107 to track underlying code changes; rename from
+  evolution-2.2.2-move-autosave-file.patch to
+  evolution-2.5.4-move-autosave-file.patch
+- added patch to fix more missing declarations (patch 805)
+- added files for publish-calendar plugin
+
 * Mon Dec 19 2005 David Malcolm <dmalcolm at redhat.com> - 2.5.3-1
 - 2.5.3
 - Updated patch 106 (evolution-2.2.2-commit-enter-on-calendar.patch) so that it


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sources	19 Dec 2005 21:09:00 -0000	1.40
+++ sources	4 Jan 2006 06:07:52 -0000	1.41
@@ -1 +1 @@
-1fac50a893b29a94e610db4c12e87373  evolution-2.5.3.tar.bz2
+1ffd40da2b98f727e18b4c3a22318ed1  evolution-2.5.4.tar.bz2


--- evolution-2.2.2-move-autosave-file.patch DELETED ---


