diff --git a/evolution-2.26.0.tar.bz2 b/evolution-2.26.0.tar.bz2
deleted file mode 100644
index 3ff4342..0000000
--- a/evolution-2.26.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:74a2d936ba8330d0abe059062bb84446f379c605480c0c404575e419926d5004
-size 32677910
diff --git a/evolution-2.26.1.1.tar.bz2 b/evolution-2.26.1.1.tar.bz2
new file mode 100644
index 0000000..b3a4f56
--- /dev/null
+++ b/evolution-2.26.1.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82d6b10c5682900d91dfa40b8c1e76e7ef2e2168e26982828814ffc66930daa2
+size 32809193
diff --git a/evolution.changes b/evolution.changes
index d8afcc1..7000bc7 100644
--- a/evolution.changes
+++ b/evolution.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Wed Apr 15 19:21:45 CEST 2009 - vuntz@novell.com
+
+- Update to version 2.26.1.1:
+ + bgo#578685 – evolution crashed with SIGSEGV in
+ IA__g_ascii_strcasecmp()
+- Remove fix-sendrecv.diff: this is breaking translations for no
+ good reason. See bnc#384116. Thanks to Bjørn Lie for spotting
+ this.
+
+-------------------------------------------------------------------
+Tue Apr 14 21:37:28 CEST 2009 - vuntz@novell.com
+
+- Update to version 2.26.1:
+ + bgo#504767: Inherit modality from a parent's window, if any
+ + bgo#523802: Use copy of the preview panel, when focused, and
+ events' copy otherwise
+ + bgo#529745: Add more file types in a file filter
+ + bgo#537530: Use g_filename_to_utf8 for attachment filenames
+ + bgo#539002: Show all other certificates in a contact tab
+ + bgo#552583: Compare only user names, without a domain part, if
+ such exists
+ + bgo#569765: Don't keep the selected message in the message list
+ if it is removed from the folder
+ + bgo#574248: Compare base URI case insensitively
+ + bgo#574680: Remove all headers except "References" and
+ "In-Reply-To" when composing from an existing message
+ + bgo#576694: Handle absolute font sizes correctly
+ + bgo#576696: Set mandatory properties
+ + bgo#576845: Call jh_tree_refill instead of label_tree_refill
+ + bgo#576921: Remove needless GtkListStore objects
+ + bgo#577717: Fill some default values to mandatory properties of
+ ECalComponentAttendee
+ + bgo#577989: Call gtk_message_dialog_new with a proper format
+ string
+ + bgo#578034: Call gtk_message_dialog_new with a proper format
+ string
+ + Updated translations.
+
-------------------------------------------------------------------
Mon Mar 16 16:48:58 CET 2009 - vuntz@novell.com
diff --git a/evolution.spec b/evolution.spec
index be02193..83dca9b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,5 +1,5 @@
#
-# spec file for package evolution (Version 2.26.0)
+# spec file for package evolution (Version 2.26.1.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -57,7 +57,7 @@ License: LGPL v2.0 only; LGPL v3 only
Group: Productivity/Networking/Email/Clients
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
%define evolution_base_version 2.26
-Version: 2.26.0
+Version: 2.26.1.1
Release: 1
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar.bz2
@@ -67,7 +67,6 @@ Source3: ximian-evolution-pixmaps.tar.bz2
# PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number
Patch7: calendar-sendbutton.patch
Patch8: fix-exchange-menuitem.diff
-Patch9: fix-sendrecv.diff
# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include
Patch15: evolution-custom-openldap-includes.patch
# PATCH-FEATURE-OPENSUSE evolution-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database.
@@ -431,7 +430,6 @@ translation-update-upstream
#gnome-patch-translation-prepare
# %patch7
%patch8
-%patch9
%patch15 -p1
%patch16 -p1
%patch18
@@ -603,6 +601,39 @@ fi
#%{_libdir}/evolution/*/plugins/*.dll
%changelog
+* Wed Apr 15 2009 vuntz@novell.com
+- Update to version 2.26.1.1:
+ + bgo#578685 – evolution crashed with SIGSEGV in
+ IA__g_ascii_strcasecmp()
+- Remove fix-sendrecv.diff: this is breaking translations for no
+ good reason. See bnc#384116. Thanks to Bjørn Lie for spotting
+ this.
+* Tue Apr 14 2009 vuntz@novell.com
+- Update to version 2.26.1:
+ + bgo#504767: Inherit modality from a parent's window, if any
+ + bgo#523802: Use copy of the preview panel, when focused, and
+ events' copy otherwise
+ + bgo#529745: Add more file types in a file filter
+ + bgo#537530: Use g_filename_to_utf8 for attachment filenames
+ + bgo#539002: Show all other certificates in a contact tab
+ + bgo#552583: Compare only user names, without a domain part, if
+ such exists
+ + bgo#569765: Don't keep the selected message in the message list
+ if it is removed from the folder
+ + bgo#574248: Compare base URI case insensitively
+ + bgo#574680: Remove all headers except "References" and
+ "In-Reply-To" when composing from an existing message
+ + bgo#576694: Handle absolute font sizes correctly
+ + bgo#576696: Set mandatory properties
+ + bgo#576845: Call jh_tree_refill instead of label_tree_refill
+ + bgo#576921: Remove needless GtkListStore objects
+ + bgo#577717: Fill some default values to mandatory properties of
+ ECalComponentAttendee
+ + bgo#577989: Call gtk_message_dialog_new with a proper format
+ string
+ + bgo#578034: Call gtk_message_dialog_new with a proper format
+ string
+ + Updated translations.
* Mon Mar 16 2009 vuntz@novell.com
- Update to version 2.26.0:
+ Bugs Fixed: bgo#342446, bgo#573122, bgo#573193, bgo#435455,
@@ -932,7 +963,7 @@ fi
* Mon Oct 27 2008 hpj@novell.com
- Add evolution-shared-nss-db.patch, which migrates the old NSS
cert DB to the new, shared format and location.
-* Thu Oct 23 2008 msuman@suse.de
+* Fri Oct 24 2008 msuman@suse.de
- Update to version 2.24.1
+ Bugs fixed: bgo#364542, bgo#438155, bgo#497928, bgo#511918,
bgo#511947, bgo#514989, bgo#519491, bgo#528816, bgo#530606,
@@ -968,7 +999,7 @@ fi
- Update to version 2.23.92:
+ Bug fixed: bgo#549968
+ Updated translations.
-* Tue Sep 02 2008 maw@suse.de
+* Wed Sep 03 2008 maw@suse.de
- Update to version 2.23.91:
+ Bugs fixed: bgo#458512, bgo#509647, bgo#523327, bgo#525555,
bgo#534762, bgo#544430, bgo#546926, bgo#547822, bgo#547822,
@@ -1075,7 +1106,7 @@ fi
bug-394641_evo-CVE-2008-1109.diff
- bnc#395708 - bgo-395708_prefer-plain.patch - Outlook meeting invites look as text messages
- bnc#394441 - bnc-394441-exchange-addbook-crash.diff - Addressbook crash
-* Tue May 20 2008 msuman@suse.de
+* Wed May 21 2008 msuman@suse.de
- Added
+ bgo-534012-backup-permission.patch (Sankar P)
+ bgo-533820-fix-crash-on-border-clicking-meetings.diff (Chenthill P) (bnc#391993)
@@ -1600,7 +1631,7 @@ fi
* Thu Mar 22 2007 maw@suse.de
- Update to version 2.10.0
- Update the required intltool version.
-* Mon Mar 12 2007 maw@suse.de
+* Tue Mar 13 2007 maw@suse.de
- Update to version 2.9.91
- Remove upstreamed bnc-214647-add-prefer-plain-plugin.patch
- fix-security-gtkhtml-moreui.diff is now much smaller
@@ -1802,7 +1833,7 @@ fi
- Fixes (bnc)
160049 changed G/W password - no calendar prompt ...
158107 No notification of cancelled meetings
-* Thu Mar 23 2006 vvaradhan@novell.com
+* Fri Mar 24 2006 vvaradhan@novell.com
- Fixes (bnc)
150427 evo 1.6 hang on calendar
153807 msg composer seems to lower instead of raise
@@ -2085,17 +2116,17 @@ fi
- Fixed Send as iCalendar (#72795).
* Tue Mar 15 2005 sbrabec@suse.cz
- Fixed Czech translation.
-* Thu Mar 10 2005 gekker@suse.de
+* Fri Mar 11 2005 gekker@suse.de
- Add Email to %%suse_update_desktop_file (65804).
-* Tue Mar 08 2005 gekker@suse.de
+* Wed Mar 09 2005 gekker@suse.de
- Update to version 2.2.0 (GNOME 2.10).
* Wed Mar 02 2005 gekker@suse.de
- Update to version 2.1.6
-* Wed Feb 09 2005 gekker@suse.de
+* Thu Feb 10 2005 gekker@suse.de
- Update to version 2.1.5
* Sat Feb 05 2005 gekker@suse.de
-Update to version 2.1.4
-* Thu Jan 20 2005 ro@suse.de
+* Fri Jan 21 2005 ro@suse.de
- fixed file list
* Sat Jan 15 2005 clahey@suse.de
- Updated to version 2.1.3.
@@ -2107,7 +2138,7 @@ fi
- update to version 2.0.3 (Ximian 70057)
* Tue Nov 30 2004 ro@suse.de
- adapted evolution-2.0.1-de-po.patch
-* Mon Nov 29 2004 gekker@suse.de
+* Tue Nov 30 2004 gekker@suse.de
- Update version to 2.0.2
- Remove patches that are upstream
- Change the no-groupwise-docs patch to actually apply
@@ -2146,7 +2177,7 @@ fi
- Cache evolution help files and show evolution in khelpcenter.
* Wed Aug 18 2004 dobey@suse.de
- Comment out %%debug_package
-* Tue Aug 17 2004 dobey@suse.de
+* Wed Aug 18 2004 dobey@suse.de
- Add MozillaFirefox libdir to rpath
* Fri Aug 13 2004 dobey@suse.de
- Update to version 1.5.93
@@ -2244,7 +2275,7 @@ fi
- updated to version 1.4.4 (GTK2/GNOME2 ported)
* Mon Jul 14 2003 sbrabec@suse.cz
- GNOME prefix change to /opt/gnome.
-* Sun Jun 29 2003 ro@suse.de
+* Mon Jun 30 2003 ro@suse.de
- added directories to filelist
* Thu Jun 05 2003 ro@suse.de
- remove unpackaged files from buildroot
@@ -2390,7 +2421,7 @@ fi
- Restructuring of the package.
- Use the splitted packages oafdev and bonobod.
- Buildproofed on i386.
-* Thu Sep 21 2000 egger@suse.de
+* Fri Sep 22 2000 egger@suse.de
- Use BuildRoot.
- Buildproofed on i386.
* Tue Sep 19 2000 egger@suse.de
diff --git a/fix-sendrecv.diff b/fix-sendrecv.diff
deleted file mode 100644
index 40f5ade..0000000
--- a/fix-sendrecv.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'ui/evolution.xml'
---- ui/evolution.xml 2007-12-18 20:23:31 +0000
-+++ ui/evolution.xml 2007-12-18 20:39:20 +0000
-@@ -43,7 +43,7 @@
- _tip="Open the Frequently Asked Questions webpage"/>
-
-
-
-
-
-
-
-
-