[evolution] Update to 2.91.0
Milan Crha
mcrha at fedoraproject.org
Mon Oct 11 09:29:23 UTC 2010
commit cb00596d07ba65956e2cd1e780d0ca1bfa28deff
Author: Milan Crha <mcrha at redhat.com>
Date: Mon Oct 11 11:28:39 2010 +0200
Update to 2.91.0
.gitignore | 1 +
evolution-2.31.92-gn626066.patch | 137 --------------------------------
evolution-2.9.1-im-context-reset.patch | 9 +-
evolution.spec | 16 ++--
sources | 2 +-
5 files changed, 15 insertions(+), 150 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ee8b9fd..ef8725f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
evolution-2.31.5.tar.bz2
/evolution-2.31.91.tar.bz2
/evolution-2.31.92.tar.bz2
+/evolution-2.91.0.tar.bz2
diff --git a/evolution-2.9.1-im-context-reset.patch b/evolution-2.9.1-im-context-reset.patch
index 76e9d98..519d0d6 100644
--- a/evolution-2.9.1-im-context-reset.patch
+++ b/evolution-2.9.1-im-context-reset.patch
@@ -1,6 +1,7 @@
---- evolution-2.9.1/calendar/gui/e-day-view.c.im-context-reset 2006-11-06 10:14:26.000000000 -0500
-+++ evolution-2.9.1/calendar/gui/e-day-view.c 2006-11-06 10:15:39.000000000 -0500
-@@ -6928,6 +6928,9 @@
+diff -up evolution-2.91.0/calendar/gui/e-day-view.c.im-context-reset evolution-2.91.0/calendar/gui/e-day-view.c
+--- evolution-2.91.0/calendar/gui/e-day-view.c.im-context-reset 2010-10-03 18:36:41.000000000 +0200
++++ evolution-2.91.0/calendar/gui/e-day-view.c 2010-10-11 11:24:30.000000000 +0200
+@@ -6183,6 +6183,9 @@ e_day_view_start_editing_event (EDayView
if (!event->canvas_item)
return;
@@ -9,4 +10,4 @@
+
/* We must grab the focus before setting the initial text, since
grabbing the focus will result in a call to
- e_day_view_on_editing_started(), which will reset the text to get
+ e_day_view_on_editing_started (), which will reset the text to get
diff --git a/evolution.spec b/evolution.spec
index 835245b..1e4173f 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -11,7 +11,7 @@
%define clutter_gtk_version 0.10
%define soup_version 2.4.0
-%define evo_base_version 2.32
+%define evo_base_version 2.92
%define last_anjal_version 0.3.2-3
%define last_libgal2_version 2:2.5.3-2
@@ -28,14 +28,14 @@
### Abstract ###
Name: evolution
-Version: 2.31.92
-Release: 3%{?dist}
+Version: 2.91.0
+Release: 1%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
URL: http://projects.gnome.org/evolution/
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.bz2
Obsoletes: anjal <= %{last_anjal_version}
Obsoletes: libgal2 <= %{last_libgal2_version}
@@ -51,9 +51,6 @@ Patch12: evolution-2.9.1-im-context-reset.patch
# RH bug #589555
Patch13: evolution-2.30.1-help-contents.patch
-# Gnome bug #626066
-Patch14: evolution-2.31.92-gn626066.patch
-
## Dependencies ###
Requires(pre): GConf2
@@ -207,7 +204,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 .gn626066
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -616,6 +612,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Oct 11 2010 Milan Crha <mcrha at redhat.com> - 2.91.0-1
+- Update to 2.91.0
+- Remove patch for Gnome bug #626066 (fixed upstream)
+
* Wed Sep 29 2010 jkeating - 2.31.92-3
- Rebuilt for gcc bug 634757
diff --git a/sources b/sources
index 6e02d17..ec48a89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90d84ddb24daecd27bc5b1553064bc46 evolution-2.31.92.tar.bz2
+29cd32f9e9699d3ec757d7dff6b41b57 evolution-2.91.0.tar.bz2
More information about the scm-commits
mailing list