From 08f39756d4bde5c4101a4f2b53b8c200d89192ce Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@fedoraproject.org>
Date: Mon, 25 Jan 2010 10:42:16 +0000
Subject: [PATCH] - Update to 2.29.6 - Remove patch for Gnome bug #606874
 (fixed upstream)

---
 .cvsignore                    |  2 +-
 evolution-2.29.5-mktemp.patch | 81 -----------------------------------
 evolution.spec                | 12 +++---
 sources                       |  2 +-
 4 files changed, 8 insertions(+), 89 deletions(-)
 delete mode 100644 evolution-2.29.5-mktemp.patch

diff --git a/.cvsignore b/.cvsignore
index d12de20..8c8610b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.29.5.tar.bz2
+evolution-2.29.6.tar.bz2
diff --git a/evolution-2.29.5-mktemp.patch b/evolution-2.29.5-mktemp.patch
deleted file mode 100644
index 7f44ecf..0000000
--- a/evolution-2.29.5-mktemp.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c
-index a289866..f783e6c 100644
---- a/composer/e-composer-autosave.c
-+++ b/composer/e-composer-autosave.c
-@@ -91,6 +91,7 @@ static gboolean
- composer_autosave_state_open (AutosaveState *state)
- {
- 	gchar *path;
-+	gint fd;
- 
- 	if (state->file != NULL)
- 		return TRUE;
-@@ -100,13 +101,16 @@ composer_autosave_state_open (AutosaveState *state)
- 
- 	/* Since GIO doesn't have support for creating temporary files
- 	 * from a template (and in a given directory), we have to use
--	 * mktemp(), which brings a small risk of overwriting another
-+	 * g_mkstemp(), which brings a small risk of overwriting another
- 	 * autosave file.  The risk is, however, miniscule. */
--	if (mktemp (path) == NULL) {
-+	fd = g_mkstemp (path);
-+	if (fd == -1) {
- 		g_free (path);
- 		return FALSE;
- 	}
- 
-+	close (fd);
-+
- 	/* Create the GFile */
- 	state->file = g_file_new_for_path (path);
- 	g_free (path);
-diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
-index 509b312..15b5668 100644
---- a/e-util/e-mktemp.c
-+++ b/e-util/e-mktemp.c
-@@ -167,7 +167,7 @@ gchar *
- e_mktemp (const gchar *template)
- {
- 	GString *path;
--	gchar *ret;
-+	gint fd;
- 
- 	path = get_dir (TRUE);
- 	if (!path)
-@@ -179,10 +179,14 @@ e_mktemp (const gchar *template)
- 	else
- 		g_string_append (path, "unknown-XXXXXX");
- 
--	ret = mktemp (path->str);
--	g_string_free(path, ret == NULL);
-+	fd = g_mkstemp (path->str);
- 
--	return ret;
-+	if (fd != -1) {
-+		close (fd);
-+		g_unlink (path->str);
-+	}
-+
-+	return g_string_free (path, fd == -1);
- }
- 
- gint
-@@ -226,7 +230,17 @@ e_mkdtemp (const gchar *template)
- #ifdef HAVE_MKDTEMP
- 	tmpdir = mkdtemp (path->str);
- #else
--	tmpdir = mktemp (path->str);
-+	{
-+		gint fd = g_mkstemp (path->str);
-+		if (fd == -1) {
-+			tmpdir = NULL;
-+		} else {
-+			close (fd);
-+			tmpdir = path->str;
-+			g_unlink (tmpdir);
-+		}
-+	}
-+
- 	if (tmpdir) {
- 		if (g_mkdir (tmpdir, S_IRWXU) == -1)
- 			tmpdir = NULL;
diff --git a/evolution.spec b/evolution.spec
index ede1ef9..6e130ab 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -38,8 +38,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.29.5
-Release: 2%{?dist}
+Version: 2.29.6
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -62,9 +62,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch
 # RH bug #176400
 Patch12: evolution-2.9.1-im-context-reset.patch
 
-# Gnome bug #606874 / RH bug #554643
-Patch13: evolution-2.29.5-mktemp.patch
-
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -232,7 +229,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %patch10 -p1 -b .ldaphack
 %patch11 -p1 -b .fix-conduit-dir
 %patch12 -p1 -b .im-context-reset
-%patch13 -p1 -b .mktemp
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -679,6 +675,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Jan 25 2010 Milan Crha <mcrha@redhat.com> - 2.29.6-1.fc13
+- Update to 2.29.6
+- Remove patch for Gnome bug #606874 (fixed upstream)
+
 * Mon Jan 18 2010 Matthias Clasen <mclasen@redhat.com> - 2.29.5-2.fc13
 - Rebuild against new gnome-desktop
 
diff --git a/sources b/sources
index 42c662d..d2c8d44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aa88d120231c0e53f78a49ff7f520337  evolution-2.29.5.tar.bz2
+a6e5054b9f5ad373e8ed545418637c33  evolution-2.29.6.tar.bz2