From ce9227a9d05c3a2ab0ac8038d077fa9848402657 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@fedoraproject.org>
Date: Mon, 3 May 2010 16:59:25 +0000
Subject: [PATCH] - Update to 2.31.1 - Update BuildRequires. - Remove imap4
 camel provider support (dropped upstream).

---
 .cvsignore                 |  2 +-
 evolution-data-server.spec | 34 ++++++++++++++++------------------
 sources                    |  2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6874c02..423c10e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-2.29.90.tar.bz2
+evolution-data-server-2.31.1.tar.bz2
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 8f2c58d..f2593f9 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -5,18 +5,18 @@
 
 %define dbus_glib_version 0.6
 %define glib2_version 2.16.1
-%define gtk2_version 2.14.0
+%define gtk2_version 2.20.0
 %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 soup_version 2.3.0
 %define sqlite_version 3.5
 
-%define eds_base_version 2.30
+%define eds_base_version 3.0
 
 %define use_gnome_keyring 1
-%define support_imap4_provider 0
 
 %define camel_provider_dir %{_libdir}/evolution-data-server-1.2/camel-providers
 %define eds_extensions_dir %{_libdir}/evolution-data-server-1.2/extensions
@@ -24,14 +24,14 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 2.29.90
-Release: 3%{?dist}
+Version: 2.31.1
+Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
 URL: http://projects.gnome.org/evolution/
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
 
 Provides: evolution-webcal = %{version}
 Obsoletes: evolution-webcal < 2.24.0
@@ -51,13 +51,14 @@ BuildRequires: gettext
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: gnome-common
 BuildRequires: gnutls-devel
+BuildRequires: gperf
 BuildRequires: gtk-doc >= %{gtk_doc_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
 BuildRequires: intltool >= %{intltool_version}
-BuildRequires: libglade2-devel
 %if %{use_gnome_keyring}
 BuildRequires: gnome-keyring-devel
 %endif
+BuildRequires: libgdata-devel >= %{libgdata_version}
 BuildRequires: libgweather-devel >= %{libgweather_version}
 BuildRequires: libical-devel >= %{libical_version}
 BuildRequires: libsoup-devel >= %{soup_version}
@@ -167,12 +168,6 @@ fi
 %define keyring_flags --disable-gnome-keyring
 %endif
 
-%if %{support_imap4_provider}
-%define imap4_flags --enable-imap4=yes
-%else
-%define imap4_flags --enable-imap4=no
-%endif
-
 export CPPFLAGS="-I%{_includedir}/et"
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et"
 
@@ -192,7 +187,7 @@ autoconf
 	--enable-file-locking=fcntl \
 	--enable-dot-locking=no \
 	--enable-gtk-doc \
-	%ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags \
+	%ldap_flags %krb5_flags %nntp_flags %ssl_flags \
 	%keyring_flags
 export tagname=CC
 make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
@@ -257,10 +252,8 @@ rm -rf $RPM_BUILD_ROOT
 %{camel_provider_dir}/libcamelimap.so
 %{camel_provider_dir}/libcamelimap.urls
 
-%if %{support_imap4_provider}
-%{camel_provider_dir}/libcamelimap4.so
-%{camel_provider_dir}/libcamelimap4.urls
-%endif
+%{camel_provider_dir}/libcamelimapx.so
+%{camel_provider_dir}/libcamelimapx.urls
 
 %{camel_provider_dir}/libcamellocal.so
 %{camel_provider_dir}/libcamellocal.urls
@@ -333,6 +326,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon May 03 2010 Milan Crha <mcrha@redhat.com> - 2.31.1-1.fc14
+- Update to 2.31.1
+- Update BuildRequires.
+- Remove imap4 camel provider support (dropped upstream).
+
 * Tue Feb 09 2010 Milan Crha <mcrha@redhat.com> - 2.29.90-3.fc13
 - Return back BuildRequires: libglade2-devel.
 
diff --git a/sources b/sources
index 21e5ea1..988038b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-69a18f130a80a6713e58572ce98f4c18  evolution-data-server-2.29.90.tar.bz2
+f496139410627884c3943da85fe65240  evolution-data-server-2.31.1.tar.bz2