rpms/evolution/FC-5 evolution.spec,1.134,1.135 sources,1.46,1.47

[fedora-cvs-commits at redhat.com]

Author: mclasen

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

Modified Files:
	evolution.spec sources 
Log Message:
2.6.1



Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/evolution.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- evolution.spec	14 Mar 2006 06:57:34 -0000	1.134
+++ evolution.spec	11 Apr 2006 03:07:22 -0000	1.135
@@ -11,7 +11,7 @@
 %define gnomevfs2_version 2.4
 %define last_libgal2_version 2:2.5.3-2
 
-%define pilot_link_version 0.12.0
+%define pilot_link_version 2:0.11.8
 %define gnome_pilot_version 2.0.13
 
 %define ldap_support 1
@@ -38,8 +38,8 @@
 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
 
 Name: evolution
-Version: 2.6.0
-Release: 1
+Version: 2.6.1
+Release: 1.fc5.1
 License: GPL
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.ximian.com/
@@ -88,7 +88,7 @@
 #Patch700: evolution-1.5.9.1-filechooser.patch
 
 # Patches for conduits, based upon rh-161817-attach-116019-conduit_pilot_link_updates.diff (the latter patch was originally by Mark G. Adams):
-Patch800: evolution-2.5.4-fix-conduits.patch
+# Patch800: evolution-2.5.4-fix-conduits.patch
 
 # Move .conduit files from share to lib (for the sake of multilib)
 Patch802: evolution-2.5.4-fix-conduit-dir.patch
@@ -238,7 +238,7 @@
 
 #patch700 -p1 -b .filechooser
 
-%patch800 -p1 -b .fix-conduits
+# %patch800 -p1 -b .fix-conduits
 %patch802 -p1 -b .fix-conduit-dir
 %patch803 -p1 -b .no-gnome-common
 %patch804 -p1 -b .fix-missing-declarations
@@ -635,6 +635,13 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.6.1-1.fc5.1
+- Update to 2.6.1
+
+* Thu Mar 30 2006 Caolan McNamara <caolanm at redhat.com> - 2.6.0-2
+- rebuild against reverted pilot-link
+- disable evolution-2.5.4-fix-conduits.patch for reversion to pilot-link 0.11.8
+
 * Mon Mar 13 2006 Ray Strode <rstrode at redhat.com> - 2.6.0-1
 - 2.6.0
 - turn on the "error on missing prototypes" check thing


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/FC-5/sources,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- sources	13 Mar 2006 17:45:46 -0000	1.46
+++ sources	11 Apr 2006 03:07:22 -0000	1.47
@@ -1 +1 @@
-5c98650b2ccf3581e7cf5af3927b95d1  evolution-2.6.0.tar.bz2
+6ca70a86e6d8e8b3824e58f28a362065  evolution-2.6.1.tar.bz2