From 06778e25de6123720fc88557173fba28fc4006f3 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@fedoraproject.org>
Date: Tue, 10 Apr 2007 20:23:07 +0000
Subject: [PATCH] update

---
 evolution.spec | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 973be74..cca17df 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -46,8 +46,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.10.0
-Release: 10%{?dist}.dwmw2.1
+Version: 2.10.1
+Release: 1%{?dist}.dwmw2.1
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -158,23 +158,14 @@ Patch46: evolution-2.10.0-use-glib-i18n.patch
 # GNOME bug #418971
 Patch47: evolution-2.10.0-drop-old-glib-support.patch
 
-# CVE-2007-1002
-Patch48: evolution-2.10.0-CVE-2007-1002.patch
+# GNOME bug #427939 (gnome-doc-utils)
+Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch
 
-# RH bug #231767 / GNOME bug #400241
-Patch49: evolution-2.10.0-let-mail-notification-build.patch
+## Dependencies ###
 
 Patch1000: evolution-2.10.0-check-only-active-folders.patch
 Patch1002: evolution-2.6.0-improve-select-thread.patch
 
-# RH bug #235056
-Patch50: evolution-2.10.0-plugins-require-libxml2.patch
-
-# GNOME bug #352713
-Patch51: evolution-2.10.0-bold-folders.patch
-
-## Dependencies ###
-
 Requires(post): GConf2
 Requires(post): scrollkeeper >= %{scrollkeeper_version}
 Requires(postun): scrollkeeper >= %{scrollkeeper_version}
@@ -325,10 +316,7 @@ Development files needed for building things which link against evolution.
 %patch45 -p1 -b .shell-main-cleanups
 %patch46 -p1 -b .use-glib-i18n
 %patch47 -p1 -b .drop-old-glib-support
-%patch48 -p1 -b .CVE-2007-1002
-%patch49 -p1 -b .let-mail-notification-build
-%patch50 -p1 -b .plugins-require-libxml2
-%patch51 -p1 -b .bold-folders
+%patch48 -p1 -b .fix-gnome-doc-utils
 
 %patch1000 -p1
 %patch1002 -p1
@@ -748,6 +736,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Apr 09 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-1.fc7
+- Update to 2.10.1
+- Fix buggy gnome-doc-utils.make (GNOME bug #427939).
+- Remove patch for CVE-2007-1002 (fixed upstream).
+- Remove patch for RH bug #231767 (fixed upstream).
+- Remove patch for RH bug #235056 (fixed upstream).
+- Remove patch for GNOME bug #352713 (fixed upstream).
+
 * Wed Apr 04 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-10.fc7
 - Add patch for GNOME bug #352713 (improve folder tree updates).