rpms/evolution/FC-4 evolution.spec,1.77,1.78

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/evolution/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv4853

Modified Files:
	evolution.spec 
Log Message:
REbuild against older pilot-link



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-4/evolution.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- evolution.spec	1 Nov 2005 16:25:06 -0000	1.77
+++ evolution.spec	13 Apr 2006 12:57:29 -0000	1.78
@@ -28,7 +28,7 @@
 
 Name: evolution
 Version: 2.2.3
-Release: 3.fc4
+Release: 4.fc4
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -73,7 +73,7 @@
 #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
+# Patch800: rh-161817-attach-116019-conduit_pilot_link_updates.diff
 Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch
 
 # Move .conduit files from share to lib (for the sake of multilib)
@@ -199,7 +199,7 @@
 
 #patch700 -p1 -b .filechooser
 
-%patch800 -p0 -b .fix-conduits
+# %patch800 -p0 -b .fix-conduits
 %patch801 -p0 -b .fix-evo-conduit-memleaks
 %patch802 -p1 -b .fix-conduit-dir
 %patch803 -p1 -b .no-gnome-common
@@ -362,6 +362,10 @@
 %{_libdir}/evolution/%{evo_major}/*.so
 
 %changelog
+* Thu Apr 13 2006 Matthias Clasen <mclasen at redhat.com> - 2.2.3-4.fc4
+- Drop the fix-conduits patch and rebuild against the reverted
+  pilot-link
+
 * Tue Nov  1 2005 David Malcolm <dmalcolm at redhat.com> - 2.2.3-3.fc4
 - Fix the credits dialog (#169240)