diff --git a/.gitignore b/.gitignore index 11b4d3f..7d4d8fb 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.0.tar.bz2 /evolution-2.91.1.tar.bz2 /evolution-2.91.2.tar.bz2 +/evolution-2.91.3.tar.bz2 diff --git a/evolution-2.9.1-im-context-reset.patch b/evolution-2.9.1-im-context-reset.patch deleted file mode 100644 index 519d0d6..0000000 --- a/evolution-2.9.1-im-context-reset.patch +++ /dev/null @@ -1,13 +0,0 @@ -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; - -+ /* Reset IM context. */ -+ gtk_im_context_reset (E_TEXT (event->canvas_item)->im_context); -+ - /* 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 diff --git a/evolution.spec b/evolution.spec index d0e8de2..e268f12 100644 --- a/evolution.spec +++ b/evolution.spec @@ -4,7 +4,7 @@ %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.30.2.1 %define gtk2_version 2.22.0 -%define gtkhtml_version 3.91.0 +%define gtkhtml_version 3.91.3 %define intltool_version 0.35.5 %define libgdata_version 0.6.3 %define libgweather_version 2.25.4 @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 2.91.2 +Version: 2.91.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -45,9 +45,6 @@ Obsoletes: libgal2 <= %{last_libgal2_version} # bad hack Patch10: evolution-1.4.4-ldap-x86_64-hack.patch -# RH bug #176400 -Patch12: evolution-2.9.1-im-context-reset.patch - # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch @@ -203,7 +200,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %prep %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack -%patch12 -p1 -b .im-context-reset %patch13 -p1 -b .help-contents mkdir -p krb5-fakeprefix/include @@ -605,6 +601,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Nov 29 2010 Milan Crha - 2.91.3-1 +- Update to 2.91.3 +- Remove patch for Red Hat bug #176400 (fixed upstream) + * Mon Nov 08 2010 Milan Crha - 2.91.2-1 - Update to 2.91.2 diff --git a/sources b/sources index 4b6f0bb..7852924 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa9b0d68842def673f13fbb8e7d40ea4 evolution-2.91.2.tar.bz2 +e82c28acf99628e5f41f7cae4afaffbb evolution-2.91.3.tar.bz2