From 142b3cb1368b9d838cc9ef76f0bd86483d5ee343 Mon Sep 17 00:00:00 2001
From: dmalcolm <dmalcolm@fedoraproject.org>
Date: Fri, 29 Jul 2005 03:16:15 +0000
Subject: [PATCH] - 2.3.6 - Bump evolution-data-server requirement to 1.3.6
 (needed for     CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING) - Removed
 libgal2[-devel] dependencies; the code has been moved into the     evolution
 tarball Thu Jul 28 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.5.1-2 -
 added experimental patch to port ETable printing to use Pango (#150458)

---
 .cvsignore     |  2 +-
 evolution.spec | 24 ++++++++++++++++++------
 sources        |  2 +-
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 95c46d4..7c96e5b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-2.3.5.1.tar.bz2
+evolution-2.3.6.tar.bz2
diff --git a/evolution.spec b/evolution.spec
index 07df348..f35cb98 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,10 +1,9 @@
 # no ppc64 mozilla
 ExcludeArch: ppc64
 
-%define gal_version 2:2.4.2
 %define gtkhtml_version 3.6.2
 %define soup_version 2.2.2
-%define eds_version 1.2.2
+%define eds_version 1.3.6
 %define use_mozilla_nss 1
 %define evo_major 2.4
 %define libbonoboui_version 2.4.2
@@ -27,7 +26,7 @@ ExcludeArch: ppc64
 %define nntp_support 1
 
 Name: evolution
-Version: 2.3.5.1
+Version: 2.3.6
 Release: 1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -56,6 +55,9 @@ Patch106: evolution-2.2.2-commit-enter-on-calendar.patch
 # Move autosave file
 Patch107: evolution-2.2.2-move-autosave-file.patch
 
+# Fix for RH bug 150458:
+Patch108: evolution-2.3.5.1-fix-150458.patch
+
 # not accepted, but proposed on a few occasions.  fixes problems with
 # some cyrus servers
 #Patch200: evolution-1.4.5-imap-command-length.patch
@@ -82,7 +84,6 @@ Group: Applications/Productivity
 Requires: scrollkeeper >= 0.1.4
 Requires: ORBit2 >= 2.7.5
 Requires: libsoup >= %{soup_version}
-Requires: libgal2 >= %{gal_version}
 Requires: evolution-data-server >= %{eds_version}
 Requires: gnome-spell >= 1.0.2
 Requires: gtk2 >= 2.4.0
@@ -97,7 +98,6 @@ Requires: libgnomeprint22 >= %{libgnomeprint22_version}
 Requires: gnome-vfs2 >= %{gnomevfs2_version}
 
 BuildRequires: gtkhtml3-devel >= %{gtkhtml_version}
-BuildRequires: libgal2-devel >= %{gal_version}
 BuildRequires: libsoup-devel >= %{soup_version}
 BuildRequires: evolution-data-server-devel >= %{eds_version}
 BuildRequires: libbonobo-devel >= 2.0
@@ -157,7 +157,6 @@ Summary: Development files for building against evolution
 Group: Development/Libraries
 Requires: %{name} = %{version}
 Requires: gtkhtml3-devel >= %{gtkhtml_version}
-Requires: libgal2-devel >= %{gal_version}
 Requires: libsoup-devel >= %{soup_version}
 
 %description devel
@@ -182,6 +181,9 @@ Development files needed for building things which link against evolution.
 
 %patch106 -p1 -b .commit-enter-on-calendar
 %patch107 -p1 -b .move-autosave-file
+cd widgets/table
+%patch108 -p3 -b .fix-150458
+cd ../..
 
 #patch200 -p1 -b .commandlength
 
@@ -347,6 +349,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Thu Jul 28 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.6-1
+- 2.3.6
+- Bump evolution-data-server requirement to 1.3.6 (needed for 
+  CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)
+- Removed libgal2[-devel] dependencies; the code has been moved into the 
+  evolution tarball
+
+* Thu Jul 28 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.5.1-2
+- added experimental patch to port ETable printing to use Pango (#150458)
+
 * Mon Jul 25 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.5.1-1
 - 2.3.5.1
 - Update evo_major from 2.2 to 2.4
diff --git a/sources b/sources
index 3252583..47688b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2271c695677a8bf8c3c96ec883a05d12  evolution-2.3.5.1.tar.bz2
+54580913d34a05425b17eacb6dcc15ae  evolution-2.3.6.tar.bz2