From 05594beb795a90bf5a78138b311057173b8e52e8 Mon Sep 17 00:00:00 2001
From: dmalcolm <dmalcolm@fedoraproject.org>
Date: Fri, 18 Mar 2005 01:08:57 +0000
Subject: [PATCH] - 2.2.1 - Updated requirements: gtkhtml3 from 3.6.0 to 3.6.1
 libgal2 from 2.4.0 to 2.4.1 eds from 1.2.0 to 1.2.1 - Added rum-time
 requirement on gnome-vfs2; updated version requirement     from 2.0 to 2.4 -
 The new-mail-notify plugin will not be built for now since the upstream    
 configure test now checks for dbus-glib-1 version <= 0.23.4 (to     minimise
 problems caused by the API change)

---
 .cvsignore     |  2 +-
 evolution.spec | 23 +++++++++++++++++------
 sources        |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 63da844..9ac4b7f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.2.0.tar.bz2
+evolution-2.2.1.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index f941444..36fd033 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,10 +1,10 @@
 # no ppc64 mozilla
 ExcludeArch: ppc64
 
-%define gal_version 2:2.4.0
-%define gtkhtml_version 3.6.0
+%define gal_version 2:2.4.1
+%define gtkhtml_version 3.6.1
 %define soup_version 2.2.2
-%define eds_version 1.2.0
+%define eds_version 1.2.1
 %define use_mozilla_nss 1
 %define evo_major 2.2
 %define libbonoboui_version 2.4.2
@@ -12,6 +12,7 @@ ExcludeArch: ppc64
 %define gnome_icon_theme_version 1.3.6
 %define libgnomeprint22_version 2.8.0
 %define dbus_version 0.31
+%define gnomevfs2_version 2.4
 
 ##########################################################
 # The Mozilla NSS API/ABI stabilised by version 1.7.3
@@ -34,8 +35,8 @@ ExcludeArch: ppc64
 %define nntp_support 1
 
 Name: evolution
-Version: 2.2.0
-Release: 10
+Version: 2.2.1
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -91,6 +92,7 @@ Requires: redhat-menus >= 1.13
 Requires: gnutls
 Requires: dbus >= %{dbus_version}
 Requires: libgnomeprint22 >= %{libgnomeprint22_version}
+Requires: gnome-vfs2 >= %{gnomevfs2_version}
 
 BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
 BuildRequires: libgal2-devel >= %{gal_version}
@@ -98,7 +100,7 @@ BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: evolution-data-server-devel >= %{eds_version}
 BuildRequires: libbonobo-devel >= 2.0
 BuildRequires: libbonoboui-devel >= %{libbonoboui_version}
-BuildRequires: gnome-vfs2-devel >= 2.0
+BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version}
 BuildRequires: libgnomeui-devel >= 2.0
 BuildRequires: libgnomecanvas-devel >= 2.0
 BuildRequires: libxml2-devel
@@ -343,6 +345,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*/*.a
 
 %changelog
+* Thu Mar 17 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.1-1
+- 2.2.1
+- Updated requirements:
+  * gtkhtml3 from 3.6.0 to 3.6.1
+  * libgal2 from 2.4.0 to 2.4.1
+  * eds from 1.2.0 to 1.2.1
+- Added rum-time requirement on gnome-vfs2; updated version requirement from 2.0 to 2.4
+- The new-mail-notify plugin will not be built for now since the upstream configure test now checks for dbus-glib-1 version <= 0.23.4 (to minimise problems caused by the API change)
+
 * Mon Mar 14 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.0-10
 - disabled pilot-link support for now so that we have an evolution package; more patching is needed to get this to work with pilot-link-0.12
 
diff --git a/sources b/sources
index 55fa245..ceb7a25 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a93991fb80c7fa88f6758661c8931f6b  evolution-2.2.0.tar.bz2
+97b7d0257f3c8994964f703673661d34  evolution-2.2.1.tar.bz2