From 00801bbb718606132af719be23291e88c1956371 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 9 May 2011 09:22:44 +0200
Subject: [PATCH] Update to 3.1.1

---
 .gitignore                 |  1 +
 evolution-data-server.spec | 18 +++++++-----------
 sources                    |  2 +-
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index a55c418..44dfa0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ evolution-data-server-2.31.5.tar.bz2
 /evolution-data-server-2.91.91.tar.bz2
 /evolution-data-server-2.91.92.tar.bz2
 /evolution-data-server-3.0.0.tar.bz2
+/evolution-data-server-3.1.1.tar.bz2
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index a2e7bd0..2a9c4c0 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -14,7 +14,7 @@
 %define soup_version 2.3.0
 %define sqlite_version 3.5
 
-%define eds_base_version 3.0
+%define eds_base_version 3.1
 
 %define use_gnome_keyring 1
 
@@ -25,14 +25,14 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 3.0.0
+Version: 3.1.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}/3.0/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.bz2
 
 Provides: evolution-webcal = %{version}
 Obsoletes: evolution-webcal < 2.24.0
@@ -242,7 +242,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libedata-cal-1.2.so.*
 %{_libdir}/libedataserver-1.2.so.*
 %{_libdir}/libedataserverui-3.0.so.*
-%{_libdir}/libegroupwise-1.2.so.*
 
 %{_libdir}/girepository-1.0/ECalendar-1.2.typelib
 %{_libdir}/girepository-1.0/EDataServer-1.2.typelib
@@ -263,9 +262,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{ecal_backends_dir}
 
 # Camel providers:
-%{camel_provider_dir}/libcamelgroupwise.so
-%{camel_provider_dir}/libcamelgroupwise.urls
-
 %{camel_provider_dir}/libcamelimap.so
 %{camel_provider_dir}/libcamelimap.urls
 
@@ -290,14 +286,12 @@ rm -rf $RPM_BUILD_ROOT
 # e-d-s extensions:
 %{ebook_backends_dir}/libebookbackendfile.so
 %{ebook_backends_dir}/libebookbackendgoogle.so
-%{ebook_backends_dir}/libebookbackendgroupwise.so
 %{ebook_backends_dir}/libebookbackendldap.so
 %{ebook_backends_dir}/libebookbackendvcf.so
 %{ebook_backends_dir}/libebookbackendwebdav.so
 %{ecal_backends_dir}/libecalbackendcaldav.so
 %{ecal_backends_dir}/libecalbackendcontacts.so
 %{ecal_backends_dir}/libecalbackendfile.so
-%{ecal_backends_dir}/libecalbackendgroupwise.so
 %{ecal_backends_dir}/libecalbackendhttp.so
 %{ecal_backends_dir}/libecalbackendweather.so
 
@@ -313,7 +307,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libedata-cal-1.2.so
 %{_libdir}/libedataserver-1.2.so
 %{_libdir}/libedataserverui-3.0.so
-%{_libdir}/libegroupwise-1.2.so
 %{_libdir}/pkgconfig/camel-1.2.pc
 %{_libdir}/pkgconfig/camel-provider-1.2.pc
 %{_libdir}/pkgconfig/evolution-data-server-1.2.pc
@@ -324,7 +317,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libedata-cal-1.2.pc
 %{_libdir}/pkgconfig/libedataserver-1.2.pc
 %{_libdir}/pkgconfig/libedataserverui-3.0.pc
-%{_libdir}/pkgconfig/libegroupwise-1.2.pc
 %{_datadir}/gir-1.0/ECalendar-1.2.gir
 %{_datadir}/gir-1.0/EDataServer-1.2.gir
 
@@ -340,6 +332,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
+* Mon May 09 2011 Milan Crha <mcrha@redhat.com> - 3.1.1-1
+- Update to 3.1.1
+- Drop groupwise backends, as it was split out upstream
+
 * Mon Apr 04 2011 Milan Crha <mcrha@redhat.com> - 3.0.0-1
 - Update to 3.0.0
 
diff --git a/sources b/sources
index 3756422..0bad6f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fdb3cd7f295fc75ef6888fca2918ee96  evolution-data-server-3.0.0.tar.bz2
+45b5b9d0babb26caa4a82955dccce3d0  evolution-data-server-3.1.1.tar.bz2