From bf04f060cf7c3abf70f2836f74fedeca18c7cc87 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 04:35:02 +0000
Subject: auto-import changelog data from evolution-1.0.3-4.src.rpm

Mon Apr 15 2002 Jeremy Katz <katzj@redhat.com> 1.0.3-4
- include fejj(at)ximian.com's patch to fix the EINPROGRESS error with ssl
    since it's been committed to the branch and fixes the problem for me
- include patch from tagoh(at)redhat.com to change the default charset for
    Japanese to ISO-2022-JP (#63214)

---

diff --git a/evolution.spec b/evolution.spec
index f2d3e99..6c6f3e0 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -15,7 +15,7 @@ ExcludeArch: ia64
 
 Name: evolution
 Version: 1.0.3
-Release: 3
+Release: 4
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -25,10 +25,13 @@ Source1: db-3.1.17.tar.gz
 Patch0: evolution-1.0.3-non-attendee-acceptance.patch
 Patch1: evolution-1.0.3-startupwizardcrash.patch
 Patch2: evolution-1.0.3-useproperldapattribs.patch
+Patch3: evolution-1.0.3-einprogress.patch
 
 # Red Hat Linux specific patches
 Patch10: evolution-1.0.1-dborder.patch
 Patch11: evolution-1.0.2-redhatify.patch
+
+Patch20: evolution-ja-charset.patch
 Summary: GNOME's next-generation groupware suite
 Group: Applications/Productivity
 
@@ -82,11 +85,14 @@ personal information-management tool.
 %patch0 -p0 -b .appointments
 %patch1 -p0 -b .startupwizardcrash
 %patch2 -p0 -b .ldapattribs
+%patch3 -p0 -b .einprogress
 
 # Red Hat specific patches
 %patch10 -p0 -b .dborder
 %patch11 -p0 -b .rhatify
 
+%patch20 -p0 -b .jacharset
+
 %build
 
 ## build our db 3.1.17
@@ -178,6 +184,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Apr 15 2002 Jeremy Katz <katzj@redhat.com> 1.0.3-4
+- include fejj(at)ximian.com's patch to fix the EINPROGRESS error with ssl 
+  since it's been committed to the branch and fixes the problem for me
+- include patch from tagoh(at)redhat.com to change the default charset 
+  for Japanese to ISO-2022-JP (#63214)
+
 * Wed Apr 10 2002 Jeremy Katz <katzj@redhat.com> 1.0.3-3
 - minor tweaks to the redhatify patch
 - make accepting appointments sent to mailing lists work