From 250490d124e8f940f0b486454365ea596aa2965b Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 31 Jan 2011 14:48:55 +0100
Subject: [PATCH] Update to 2.91.6

---
 .gitignore                           |  1 +
 evolution-data-server-gweather.patch | 13 -------------
 evolution-data-server.spec           | 17 +++++++++--------
 sources                              |  2 +-
 4 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 evolution-data-server-gweather.patch

diff --git a/.gitignore b/.gitignore
index fab9a5d..70d4e25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ evolution-data-server-2.31.5.tar.bz2
 /evolution-data-server-2.91.3.tar.bz2
 /evolution-data-server-2.91.4.tar.bz2
 /evolution-data-server-2.91.5.tar.bz2
+/evolution-data-server-2.91.6.tar.bz2
diff --git a/evolution-data-server-gweather.patch b/evolution-data-server-gweather.patch
deleted file mode 100644
index d7b2c68..0000000
--- a/evolution-data-server-gweather.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.ac	2011-01-31 09:41:42.651363296 +0000
-+++ configure.ac	2011-01-31 09:41:42.651363296 +0000
-@@ -60,8 +60,8 @@
- 	LIBEDATASERVERUI_API_VERSION=1.2
- 	GTK_PACKAGE="gtk+-2.0"
- 	gtk_minimum_version="2.22.0"
--	GWEATHER_PACKAGE="gweather"
--	gweather_minimum_version="2.25.4"
-+	GWEATHER_PACKAGE="gweather-3.0"
-+	gweather_minimum_version="2.90.0"
- fi
- 
- AM_CONDITIONAL([ENABLE_GTK3], [test "$enable_gtk3" = yes])
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 0707e0b..d3915d9 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -5,12 +5,12 @@
 %define largefile_support 1
 
 %define glib2_version 2.25.12
-%define gtk2_version 2.22.0
+%define gtk3_version 2.99.2
 %define gtk_doc_version 1.9
 %define intltool_version 0.35.5
-%define libgdata_version 0.6.3
-%define libgweather_version 2.25.4
-%define libical_version 0.43
+%define libgdata_version 0.7.0
+%define libgweather_version 2.91.0
+%define libical_version 0.46
 %define soup_version 2.3.0
 %define sqlite_version 3.5
 
@@ -25,8 +25,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.91.5
-Release: 4%{?dist}
+Version: 2.91.6
+Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -41,7 +41,6 @@ Obsoletes: evolution-webcal < 2.24.0
 
 # RH bug #243296
 Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
-Patch12: evolution-data-server-gweather.patch
 
 ### Build Dependencies ###
 
@@ -120,7 +119,6 @@ This package contains developer documentation for %{name}.
 %setup -q
 
 %patch11 -p1 -b .fix-64bit-acinclude
-%patch12 -p0 -b .gweather
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -342,6 +340,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon Jan 31 2011 Milan Crha <mcrha@redhat.com> - 2.91.6-1
+- Update to 2.91.6
+
 * Mon Jan 31 2011 Caolánc McNamara <caolanm@redhat.com> - 2.91.5-4
 - Rebuild against new libgweather
 
diff --git a/sources b/sources
index 8ecdede..1c44440 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46e3080b2bdc0703b1aaad44e75dbf99  evolution-data-server-2.91.5.tar.bz2
+bc80989e8fd93eab471cb83f7c8db261  evolution-data-server-2.91.6.tar.bz2