From 2da3bf4480ab2816a2bfc749296af3fa76e26552 Mon Sep 17 00:00:00 2001
From: dmalcolm <dmalcolm@fedoraproject.org>
Date: Wed, 9 Mar 2005 00:47:06 +0000
Subject: [PATCH] - 2.2.0 - Removed patch for GCC 4 fix as this is now in
 upstream tarball - Updated requirements: gtkhtml3 from 3.5.7 to 3.6.0 libgal2
 from 2.3.5 to 2.4.0 eds from 1.1.6 to 1.2.0

---
 evolution.spec | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 594e406..6a5da66 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,10 +1,10 @@
 # no ppc64 mozilla
 ExcludeArch: ppc64
 
-%define gal_version 2:2.3.5
-%define gtkhtml_version 3.5.7
+%define gal_version 2:2.4.0
+%define gtkhtml_version 3.6.0
 %define soup_version 2.2.2
-%define eds_version 1.1.6
+%define eds_version 1.2.0
 %define use_mozilla_nss 1
 %define evo_major 2.2
 %define libbonoboui_version 2.4.2
@@ -28,8 +28,8 @@ ExcludeArch: ppc64
 %define nntp_support 1
 
 Name: evolution
-Version: 2.1.6
-Release: 3
+Version: 2.2.0
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -48,7 +48,6 @@ Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
 # patches sent upstream
 Patch100: evo-addressbook-print-with-pango-2.patch
 Patch101: evo-calendar-print-with-pango-4.patch
-Patch102: evolution-2.1.6-gcc4-fixes.patch
 
 # not accepted, but proposed on a few occasions.  fixes problems with
 # some cyrus servers
@@ -169,7 +168,6 @@ Development files needed for building things which link against evolution.
 # patches sent upstream
 %patch100 -p0 -b .addressbook-print-with-pango
 %patch101 -p0 -b .calendar-print-with-pango
-%patch102 -p1 -b .gcc4-fixes
 
 #patch200 -p1 -b .commandlength
 
@@ -329,6 +327,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*/*.a
 
 %changelog
+* Tue Mar  8 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.0-1
+- 2.2.0
+- Removed patch for GCC 4 fix as this is now in upstream tarball
+- Updated requirements:
+  * gtkhtml3 from 3.5.7 to 3.6.0
+  * libgal2 from 2.3.5 to 2.4.0
+  * eds from 1.1.6 to 1.2.0
+
 * Tue Mar  8 2005 David Malcolm <dmalcolm@redhat.com> - 2.1.6-3
 - rebuild (to use latest DBus library)