From 09003fca270c0aa375359679a4ebab05f509ac25 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Apr 28 2007 03:52:02 +0000
Subject: - Add patch for RH bug #236399 (en_CA attribution format).


---

diff --git a/evolution-2.10.1-en_CA-attribution-format.patch b/evolution-2.10.1-en_CA-attribution-format.patch
new file mode 100644
index 0000000..663d243
--- /dev/null
+++ b/evolution-2.10.1-en_CA-attribution-format.patch
@@ -0,0 +1,11 @@
+--- evolution-2.10.1/po/en_CA.po.en_CA-attribution-format	2007-04-27 22:58:06.000000000 -0400
++++ evolution-2.10.1/po/en_CA.po	2007-04-27 22:58:36.000000000 -0400
+@@ -10992,7 +10992,7 @@
+ "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+ "${TimeZone}, ${Sender} wrote:"
+ msgstr ""
+-"On ${AbbrevWeekdayName}, ${Year}-${Day}-${Month} at ${24Hour}:${Minute} "
++"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+ "${TimeZone}, ${Sender} wrote:"
+ 
+ #: ../mail/em-filter-editor.c:155
diff --git a/evolution.spec b/evolution.spec
index c537a09..068049a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -47,7 +47,7 @@
 
 Name: evolution
 Version: 2.10.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -170,6 +170,9 @@ Patch50: evolution-2.10.1-saving-attachments.patch
 # RH bug #236860 / GNOME bug #407104
 Patch51: evolution-2.10.1-fix-uri-handling.patch
 
+# RH bug #236399 / GNOME bug #434019
+Patch52: evolution-2.10.1-en_CA-attribution-format.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -326,6 +329,7 @@ Development files needed for building things which link against evolution.
 %patch49 -p1 -b .fix-help
 %patch50 -p1 -b .saving-attachments
 %patch51 -p1 -b .fix-uri-handling
+%patch52 -p1 -b .en_CA-attribution-format
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -747,6 +751,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Fri Apr 27 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-8.fc7
+- Add patch for RH bug #236399 (en_CA attribution format).
+
 * Mon Apr 23 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-7.fc7
 - Remove the welcome email from evolution@novell.com (bug #179427).