commit eb8425bdb96c8ad6a438ee84295e93fd7663e026
Author: Matthew Barnes <mbarnes at redhat.com>
Date: Mon Jul 4 20:34:08 2011 -0400
3.1.3
.gitignore | 1 +
evolution-3.1.2-libgdata_0_9.patch | 59 ------------------------------------
evolution.spec | 16 ++++++----
sources | 2 +-
4 files changed, 12 insertions(+), 66 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 806a415..5a1177c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ evolution-2.31.5.tar.bz2
/evolution-3.0.0.tar.bz2
/evolution-3.1.1.tar.bz2
/evolution-3.1.2.tar.bz2
+/evolution-3.1.3.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 3e98e2b..f822f4c 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -27,8 +27,8 @@
### Abstract ###
Name: evolution
-Version: 3.1.2
-Release: 2%{?dist}
+Version: 3.1.3
+Release: 1%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
@@ -47,8 +47,7 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
# RH bug #589555
Patch13: evolution-2.30.1-help-contents.patch
-Patch14: evolution-3.1.2-libgdata_0_9.patch
-Patch15: evolution-3.1.2-g_const_return.patch
+Patch14: evolution-3.1.2-g_const_return.patch
## Dependencies ###
@@ -78,6 +77,7 @@ BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gnome-common
BuildRequires: gnome-desktop3-devel >= %{gnome_desktop_version}
BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires: gnome-online-accounts
BuildRequires: gnutls-devel
BuildRequires: gtk-doc
BuildRequires: gtk3-devel >= %{gtk3_version}
@@ -205,8 +205,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
%setup -q -n evolution-%{version}
%patch10 -p1 -b .ldaphack
%patch13 -p1 -b .help-contents
-%patch14 -p1 -b .libgdata_0_9
-%patch15 -p1 -b .g_const_return
+%patch14 -p1 -b .g_const_return
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -444,6 +443,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail.so
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mailto-handler.so
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so
+%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-online-accounts.so
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-manager.so
%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-startup-wizard.so
@@ -637,6 +637,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Jul 04 2011 Matthew Barnes <mbarnes at redhat.com> - 3.1.3-1
+- Update to 3.1.3
+- Remove patch for building against libgdata-0.9.0 (fixed upstream).
+
* Wed Jun 15 2011 Milan Crha <mcrha at redhat.com> - 3.1.2-2
- Rebuild against newer gnome-desktop3
diff --git a/sources b/sources
index 885007a..00862d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-88a2f03c2b89b6085edce87ea4220702 evolution-3.1.2.tar.bz2
+50d890b7ed7d431f68a5756b9e1be14e evolution-3.1.3.tar.bz2