From 09e24157f82c1c551da92f34d407ab1944e74832 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Tue, 7 Nov 2006 11:46:54 +0000
Subject: [PATCH] - Update to 2.9.2 - Remove patch for Gnome.org bug #360240
 (fixed upstream). - Remove patch for Gnome.org bug #360619 (fixed upstream).

---
 .cvsignore     |  2 +-
 evolution.spec | 22 +++++++++++-----------
 sources        |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 23cc717..a8e20c4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.9.1.tar.bz2
+evolution-2.9.2.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index d231a0e..f68793f 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -35,15 +35,15 @@
 %define use_mozilla_nss 1
 
 # Use stricter build settings than required by upstream.
-%define strict_build_settings 0
+%define strict_build_settings 1
 
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 ### Abstract ###
 
 Name: evolution
-Version: 2.9.1
-Release: 3%{?dist}
+Version: 2.9.2
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -121,12 +121,6 @@ Patch30: evolution-2.8.0-more-deprecated.patch
 # RH bug #202751 / Gnome.org bug #355766
 #Patch31: evolution-2.8.0-fix-indic-printing.patch
 
-# Gnome.org bug #360240
-Patch32: evolution-2.8.1-warn-unused-variable.patch
-
-# Gnome.org bug #360619
-Patch33: evolution-2.8.1-warn-incompatible-pointer-type.patch
-
 # Gnome.org bug #360946
 Patch34: evolution-2.8.1-about-dialog.patch
 
@@ -275,8 +269,6 @@ Development files needed for building things which link against evolution.
 %patch29 -p1 -b .deprecated-gdk-font
 %patch30 -p1 -b .more-deprecated
 #%patch31 -p1 -b .fix-indic-printing
-%patch32 -p1 -b .warn-unused-variable
-%patch33 -p1 -b .warn-incompatible-pointer-type
 %patch34 -p1 -b .about-dialog
 %patch35 -p1 -b .kill-ethread
 %patch36 -p1 -b .kill-ememory
@@ -622,6 +614,9 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/liborg-gnome-plugin-manager.so
 %{evo_plugin_dir}/org-gnome-plugin-manager.xml
 
+%{evo_plugin_dir}/org-gnome-prefer-plain.eplug
+%{evo_plugin_dir}/liborg-gnome-prefer-plain.so
+
 %{evo_plugin_dir}/org-gnome-print-message.eplug
 %{evo_plugin_dir}/liborg-gnome-print-message.so
 %{evo_plugin_dir}/org-gnome-print-message.xml
@@ -681,6 +676,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Nov 06 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.2-1.fc7
+- Update to 2.9.2
+- Remove patch for Gnome.org bug #360240 (fixed upstream).
+- Remove patch for Gnome.org bug #360619 (fixed upstream).
+
 * Mon Nov 06 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.1-3.fc7
 - Add patch for RH bug #176400 (reset calendar IM context).
 - Add patch for RH bug #182247 (calendar input glitch).
diff --git a/sources b/sources
index b27a08e..b4475f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7e6492d80a7405bd34568fc78074cbe  evolution-2.9.1.tar.bz2
+d6e24a907faed31cc809455e5b0eef47  evolution-2.9.2.tar.bz2