it'll work

This commit is contained in:
Caolan McNamara 2006-03-30 15:23:37 +00:00
parent d00f5d9148
commit 0ed5b954c2

View File

@ -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 @@ Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch
#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 @@ cd ../..
#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 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
* Thu Mar 30 2006 Caolan McNamara <caolanm@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@redhat.com> - 2.6.0-1
- 2.6.0
- turn on the "error on missing prototypes" check thing