From 643efa687ce6fe4c3da7961d074b46b3a1cbac0a Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 31 Aug 2011 13:36:42 +0200
Subject: [PATCH] Update to 3.0.3

---
 .gitignore                            |  1 +
 evolution-3.0.2-disconnect-pop3.patch | 23 -----------------------
 evolution-3.0.2-rhbug707578.patch     | 26 --------------------------
 evolution.spec                        | 17 +++++++----------
 sources                               |  2 +-
 5 files changed, 9 insertions(+), 60 deletions(-)
 delete mode 100644 evolution-3.0.2-disconnect-pop3.patch
 delete mode 100644 evolution-3.0.2-rhbug707578.patch

diff --git a/.gitignore b/.gitignore
index e122603..ef602fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.0.0.tar.bz2
 /evolution-3.0.1.tar.bz2
 /evolution-3.0.2.tar.bz2
+/evolution-3.0.3.tar.bz2
diff --git a/evolution-3.0.2-disconnect-pop3.patch b/evolution-3.0.2-disconnect-pop3.patch
deleted file mode 100644
index 953c8b7..0000000
--- a/evolution-3.0.2-disconnect-pop3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/mail/mail-ops.c b/mail/mail-ops.c
-index 79fce90..338e83f 100644
---- a/mail/mail-ops.c
-+++ b/mail/mail-ops.c
-@@ -322,11 +322,18 @@ fetch_mail_exec (struct _fetch_mail_msg *m,
- 				em_filter_folder_element_exec (fm, cancellable, error);
- 			}
- 
-+			g_object_ref (parent_store);
-+
- 			/* we unref the source folder here since we
- 			   may now block in finalize (we try to
- 			   disconnect cleanly) */
- 			g_object_unref (fm->source_folder);
- 			fm->source_folder = NULL;
-+
-+			/* also disconnect if not a local delivery mbox;
-+			   there is no need to keep the connection alive forever */
-+			camel_service_disconnect_sync (CAMEL_SERVICE (parent_store), TRUE, NULL);
-+			g_object_unref (parent_store);
- 		}
- 	}
- fail:
diff --git a/evolution-3.0.2-rhbug707578.patch b/evolution-3.0.2-rhbug707578.patch
deleted file mode 100644
index 1957f03..0000000
--- a/evolution-3.0.2-rhbug707578.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up evolution-3.0.2/mail/mail-send-recv.c.rhbug707578 evolution-3.0.2/mail/mail-send-recv.c
---- evolution-3.0.2/mail/mail-send-recv.c.rhbug707578	2011-06-02 07:54:56.034531697 +0200
-+++ evolution-3.0.2/mail/mail-send-recv.c	2011-06-02 07:57:45.388735422 +0200
-@@ -924,6 +924,8 @@ refresh_folders_exec (struct _refresh_fo
- 
- 	get_folders (m->store, m->folders, m->finfo);
- 
-+	camel_operation_push_message (m->info->cancellable, _("Updating..."));
-+
- 	for (i=0;i<m->folders->len;i++) {
- 		folder = e_mail_session_uri_to_folder_sync (
- 			m->info->session,
-@@ -944,9 +946,12 @@ refresh_folders_exec (struct _refresh_fo
- 			break;
- 
- 		if (m->info->state != SEND_CANCELLED)
--			g_signal_emit_by_name (m->info->cancellable, "status", _("Updating..."), 100 * i / m->folders->len);
-+			camel_operation_progress (
-+				m->info->cancellable, 100 * i / m->folders->len);
- 	}
- 
-+	camel_operation_pop_message (m->info->cancellable);
-+
- 	if (cancellable)
- 		g_signal_handler_disconnect (m->info->cancellable, handler_id);
- }
diff --git a/evolution.spec b/evolution.spec
index 8be4f45..f2b0c8f 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -27,8 +27,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.0.2
-Release: 3%{?dist}
+Version: 3.0.3
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -49,12 +49,6 @@ Patch13: evolution-2.30.1-help-contents.patch
 
 Patch14: evolution-help-gl.patch
 
-# RH bug #707578
-Patch15: evolution-3.0.2-rhbug707578.patch
-
-# RH bug #714793
-Patch16: evolution-3.0.2-disconnect-pop3.patch
-
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -211,8 +205,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %patch10 -p1 -b .ldaphack
 %patch13 -p1 -b .help-contents
 %patch14 -p1 -b .help-gl
-%patch15 -p1 -b .rhbug707578
-%patch16 -p1 -b .disconnect-pop3
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -602,6 +594,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Wed Aug 31 2011 Milan Crha <mcrha@redhat.com> - 3.0.3-1
+- Update to 3.0.3
+- Remove patch for Red Hat bug #707578 (fixed upstream)
+- Remove patch for Red Hat bug #714793 (fixed upstream)
+
 * Wed Jun 22 2011 Milan Crha <mcrha@redhat.com> - 3.0.2-3
 - Add patch for Red Hat bug #714793 (pop3 receives messages twice)
 
diff --git a/sources b/sources
index d3e3299..249efd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87f014736a6416e833e88de69df751ce  evolution-3.0.2.tar.bz2
+49f2617445dc552a1527e5a33a7ad8b9  evolution-3.0.3.tar.bz2