[evolution] Update to 2.31.91
Milan Crha
mcrha at fedoraproject.org
Mon Aug 30 08:36:48 UTC 2010
commit ea52f9ee7d698e9a09bcd7941a347854ab44499b
Author: Milan Crha <mcrha at redhat.com>
Date: Mon Aug 30 10:36:40 2010 +0200
Update to 2.31.91
.gitignore | 1 +
evolution-2.31.5-gtk-compat-crash.patch | 24 ------------------------
evolution.spec | 25 +++++++++++++++----------
sources | 2 +-
4 files changed, 17 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a151a6e..acfbdc8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
evolution-2.31.5.tar.bz2
+/evolution-2.31.91.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 6870f2b..635a981 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,6 +1,5 @@
-%define dbus_glib_version 0.70
%define dbus_version 1.0
-%define glib2_version 2.22.0
+%define glib2_version 2.25.12
%define gnome_desktop_version 2.26.0
%define gnome_doc_utils_version 0.8.0
%define gnome_icon_theme_version 2.19.91
@@ -9,9 +8,10 @@
%define intltool_version 0.35.5
%define libgdata_version 0.6.3
%define libgweather_version 2.25.4
+%define clutter_gtk_version 0.10
%define soup_version 2.4.0
-%define evo_base_version 3.0
+%define evo_base_version 2.32
%define last_anjal_version 0.3.2-3
%define last_libgal2_version 2:2.5.3-2
@@ -32,8 +32,8 @@
### Abstract ###
Name: evolution
-Version: 2.31.5
-Release: 2%{?dist}
+Version: 2.31.91
+Release: 1%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
@@ -55,9 +55,6 @@ Patch12: evolution-2.9.1-im-context-reset.patch
# RH bug #589555
Patch13: evolution-2.30.1-help-contents.patch
-# Fixes a crash in gtk-compat.h macros
-Patch14: evolution-2.31.5-gtk-compat-crash.patch
-
## Dependencies ###
Requires(pre): GConf2
@@ -78,8 +75,8 @@ BuildRequires: atk-devel
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1.9
BuildRequires: bison
+BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version}
BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
BuildRequires: desktop-file-utils
BuildRequires: evolution-data-server-devel >= %{version}
BuildRequires: gettext
@@ -210,7 +207,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
%patch10 -p1 -b .ldaphack
%patch12 -p1 -b .im-context-reset
%patch13 -p1 -b .help-contents
-%patch14 -p1 -b .gtk-compat-crash
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -618,6 +614,15 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Aug 30 2010 Milan Crha <mcrha at redhat.com> - 2.31.91-1.fc15
+- Update to 2.31.91
+- Fix handling of migrated signature files.
+- Drop dbus-glib requirement.
+- Bump glib2 requirement to 2.25.12.
+- Roll back evo_base_version to 2.32.
+- Add clutter-gtk requirement (for express mode).
+- Remove gtk-compat macro patch (fixed upstream).
+
* Thu Jul 22 2010 Matthew Barnes <mbarnes at redhat.com> - 2.31.5-2.fc14
- Add patch to fix startup crash in gtk-compat macros.
diff --git a/sources b/sources
index 7cb2a79..bb4a999 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-59a9c75d808788fa9eacce4a757b04fe evolution-2.31.5.tar.bz2
+cd5ccfdccf48ec8a41f48d9ac4b3e983 evolution-2.31.91.tar.bz2
More information about the scm-commits
mailing list