From 113fbcb095ad80a07c85fc983f7d33b74c74a11f Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Thu, 9 Sep 2004 04:39:17 +0000
Subject: [PATCH] auto-import changelog data from evolution-1.4.6-1.src.rpm Wed
 Mar 10 2004 Jeremy Katz <katzj@redhat.com> 1.4.6-1 - 1.4.6 Thu Nov 06 2003
 Jeremy Katz <katzj@redhat.com> 1.4.5-8 - fall back to HELO for ESMTP
 (#108753)

---
 .cvsignore     |  2 +-
 evolution.spec | 38 +++++++++++++++++++++++---------------
 sources        |  2 +-
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 746f3b6..d0cece4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 db-3.1.17.tar.bz2
-evolution-1.4.5.tar.gz
+evolution-1.4.6.tar.gz
diff --git a/evolution.spec b/evolution.spec
index 217a011..47831d3 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,5 +1,5 @@
-%define gal_version 2:1.99.10
-%define gtkhtml_version 3.0.9
+%define gal_version 2:1.99.11
+%define gtkhtml_version 3.0.10
 %define soup_version 1.99.26
 %define use_mozilla_nss 0
 
@@ -21,8 +21,8 @@
 %define buildtopdir $RPM_BUILD_DIR/%{name}-%{version}
 
 Name: evolution
-Version: 1.4.5
-Release: 7
+Version: 1.4.6
+Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -38,6 +38,7 @@ Patch4: evolution-1.4.5-46006-2.patch
 Patch5: evolution-1.4.5-49357.patch
 Patch6: evolution-1.4.5-reply-to-list-shortcut.patch
 Patch7: evolution-1.4.5-composer-save-title.patch
+Patch8: evolution-1.4.5-50535.patch
 
 # Red Hat Linux specific patches
 Patch11: evolution-1.3.2-redhatify.patch
@@ -136,14 +137,15 @@ Development files needed for building things which link against evolution.
 %prep
 %setup -q -a 1
 # these are in CVS already on the 1-4-branch
-%patch0 -p1 -b .gethostbyaddr
-%patch1 -p0 -b .divbyzero
-%patch2 -p0 -b .flushiconv
-%patch3 -p0 -b .ipv6num
-%patch4 -p0 -b .ipv6lookup
-%patch5 -p0 -b .tz
-%patch6 -p0 -b .list
-%patch7 -p1 -b .title
+#patch0 -p1 -b .gethostbyaddr
+#patch1 -p0 -b .divbyzero
+#patch2 -p0 -b .flushiconv
+#patch3 -p0 -b .ipv6num
+#patch4 -p0 -b .ipv6lookup
+#patch5 -p0 -b .tz
+#patch6 -p0 -b .list
+#patch7 -p1 -b .title
+#patch8 -p0 -b .esmtpehlo
 
 # Red Hat specific patches
 %patch11 -p1 -b .rhatify
@@ -153,12 +155,12 @@ Development files needed for building things which link against evolution.
 %patch98 -p1 -b .ldaphack
 
 # patches sent upstream
-%patch100 -p1 -b .filtergtype
-%patch101 -p0 -b .addrconfig
+#patch100 -p1 -b .filtergtype
+#patch101 -p0 -b .addrconfig
 
 %patch200 -p1 -b .commandlength
 
-%patch500 -p0 -b .wombatsm
+#patch500 -p0 -b .wombatsm
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -310,6 +312,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/1.4/*/*.a
 
 %changelog
+* Wed Mar 10 2004 Jeremy Katz <katzj@redhat.com> 1.4.6-1
+- 1.4.6
+
+* Thu Nov  6 2003 Jeremy Katz <katzj@redhat.com> 1.4.5-8
+- fall back to HELO for ESMTP (#108753)
+
 * Tue Oct 28 2003 Jeremy Katz <katzj@redhat.com> 1.4.5-7
 - fix title on composer save dialog (#108159)
 
diff --git a/sources b/sources
index 33f898f..034dbe0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 b237f4e38a650d096389ff54d564928d  db-3.1.17.tar.bz2
-5333b955839928530a1a9275f61e4d78  evolution-1.4.5.tar.gz
+6fadfc29fb30f37c80e1983e638f2151  evolution-1.4.6.tar.gz