rpms/evolution/devel evolution.spec,1.136,1.137
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Mar 30 15:23:39 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20660
Modified Files:
evolution.spec
Log Message:
it'll work
Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- evolution.spec 30 Mar 2006 14:46:36 -0000 1.136
+++ evolution.spec 30 Mar 2006 15:23:37 -0000 1.137
@@ -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
@@ -39,7 +39,7 @@
Name: evolution
Version: 2.6.0
-Release: 1
+Release: 2
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,10 @@
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
+* 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
More information about the fedora-cvs-commits
mailing list