From c746221c5b7bf4def947b39b63d7a34171736e55 Mon Sep 17 00:00:00 2001
From: dmalcolm <dmalcolm@fedoraproject.org>
Date: Jun 27 2005 22:58:47 +0000
Subject: - Replaced patch to port conduits to pilot-link-0.12 with Mark G Adams's

    version of same (#161817)
- Added Mark G Adams's memory leak fix (patch 801)

---

diff --git a/evolution.spec b/evolution.spec
index ad3933b..efd39cd 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -28,7 +28,7 @@ ExcludeArch: ppc64
 
 Name: evolution
 Version: 2.2.2
-Release: 8
+Release: 9.fc5
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -48,7 +48,7 @@ Patch98: evolution-1.4.4-ldap-x86_64-hack.patch
 Patch100: evo-addressbook-print-with-pango-2.patch
 Patch101: evo-calendar-print-with-pango-4.patch
 
-Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
+#Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
 
 Patch105: evolution-2.2.2-fix-new-mail-notify.patch
 
@@ -69,6 +69,10 @@ Patch107: evolution-2.2.2-move-autosave-file.patch
 # This was added upstream in 1.5.93, with configure-time detection
 #Patch700: evolution-1.5.9.1-filechooser.patch
 
+# Patches for conduits by Mark G. Adams:
+Patch800: rh-161817-attach-116019-conduit_pilot_link_updates.diff
+Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch
+
 Summary: GNOME's next-generation groupware suite
 Group: Applications/Productivity
 
@@ -173,7 +177,6 @@ Development files needed for building things which link against evolution.
 %patch100 -p0 -b .addressbook-print-with-pango
 %patch101 -p1 -b .calendar-print-with-pango
 
-%patch104 -p1 -b .port-to-pilot-link-0.12
 %patch105 -p1 -b .fix-new-mail-notify
 %patch106 -p1 -b .commit-enter-on-calendar
 %patch107 -p1 -b .move-autosave-file
@@ -184,6 +187,9 @@ Development files needed for building things which link against evolution.
 
 #patch700 -p1 -b .filechooser
 
+%patch800 -p0 -b .fix-conduits
+%patch801 -p0 -b .fix-evo-conduit-memleaks
+
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
 mkdir -p krb5-fakeprefix/%{_lib}
@@ -342,6 +348,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Mon Jun 27 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-9.fc5
+- Replaced patch to port conduits to pilot-link-0.12 with Mark G Adams's version of same (#161817)
+- Added Mark G Adams's memory leak fix (patch 801)
+
 * Mon Jun  6 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-8
 - Added Ivan Gyurdiev's patch to move autosave files inside the .evolution
   directory