--- a/Solaris/SUNWevolution.spec	Fri Oct 21 03:12:40 2005 +0000
+++ b/Solaris/SUNWevolution.spec	Fri Oct 21 03:51:00 2005 +0000
@@ -11,7 +11,7 @@
 %include Solaris.inc
 %define firefox_prefix /usr/sfw
 # Uncomment to include gnome-pilot-link, when it is acceptable quality.
-%define with_pilot_link 1
+#%define with_pilot_link 1
 %define major_version 2.4
 
 %use evolution = evolution.spec
@@ -28,18 +28,22 @@
 Source4:       evolution-addressbook-import.1
 Patch1:        evolution-01-solaris-ldap.diff
 Patch2:        evolution-02-solaris-sed.diff
-BuildRequires: SUNWgnome-javahelp-convert
 Requires:      SUNWevolution-share
 Requires:      SUNWevolution-root
 Requires:      SUNWevolution-libs
-%{?with_pilot_link:Requires:      SUNWgnome-pilot-link}
 Requires:      SUNWfirefox
 Requires:      SUNWidnl
+%{?with_pilot_link:Requires:      SUNWpltlk}
+%{?with_pilot_link:Requires:      SUNWgnome-pilot}
 BuildRequires: SUNWfirefox-devel
+BuildRequires: SUNWgnome-javahelp-convert
 BuildRequires: SUNWidnd
 BuildRequires: SUNWdtbas
 BuildRequires: SUNWevolution-data-server
-%{?with_pilot_link:BuildRequires:      SUNWgnome-pilot-link-devel}
+%{?with_pilot_link:BuildRequires:      SUNWpltlk}
+%{?with_pilot_link:BuildRequires:      SUNWsfwhea}
+%{?with_pilot_link:BuildRequires:      SUNWgnome-pilot}
+%{?with_pilot_link:BuildRequires:      SUNWgnome-pilot-devel}
 
 %package share
 Summary:       Evolution Email and Calendar - platform independent, /usr/share
@@ -81,7 +85,7 @@
 
 %build
 export LDFLAGS="%_ldflags -L%{firefox_prefix}/lib/firefox -R%{firefox_prefix}/lib/firefox -L%{_libdir} -R%{_libdir}"
-export CFLAGS="-I%{_includedir} -I/usr/sfw/include %optflags"
+export CFLAGS="-I%{_includedir} -I%{firefox_prefix}/include/firefox %optflags"
 export MSGFMT="/usr/bin/msgfmt"
 export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
 export PERL5LIB=%{_prefix}/perl5/site_perl/5.6.1/sun4-solaris-64int
@@ -123,10 +127,11 @@
 %{_libdir}/bonobo/servers
 %{_libdir}/evolution/%{major_version}/*.so*
 %{_libdir}/evolution/%{major_version}/components/*.so
-%{_libdir}/evolution/%{major_version}/conduits/*.so
+%{?with_pilot_link:%{_libdir}/evolution/%{major_version}/conduits/*.so}
 %{_libdir}/evolution/%{major_version}/plugins/*.so
 %{_libdir}/evolution/%{major_version}/plugins/*.eplug
 %{_libdir}/evolution/%{major_version}/plugins/*.xml
+%{?with_pilot_link:%{_libdir}/gnome-pilot/conduits/lib*.so*}
 %{_libexecdir}/evolution-%{major_version}
 %{_libexecdir}/evolution/%{major_version}/csv2vcard
 %{_libexecdir}/evolution/%{major_version}/evolution-addressbook-clean
@@ -176,6 +181,9 @@
 %defattr (0755, root, sys)
 
 %changelog
+* Fri Oct 21 2005 - [email protected]
+- Disable gnome_pilot_link.
+
 * Mon Oct 10 2005 - [email protected]
 - Change build require from mozilla to firefox.
 - Move upstreamed patch evolution-02-solaris-kerberos.diff.