--- a/ChangeLog	Fri Nov 02 18:49:15 2007 +0000
+++ b/ChangeLog	Mon Nov 05 05:10:09 2007 +0000
@@ -1,3 +1,9 @@
+2007-11-05  Jeff Cai<[email protected]>
+
+	* SUNWevolution-data-server.spec:
+	* SUNWevolution.spec:
+	Use system ldflag to enable -Bdirect.
+
 2007-11-02  Brian Cameron  <[email protected]>
 
 	* ext-sources/gnome-cleanup: Fix so that it deletes a few new

--- a/SUNWevolution-data-server.spec	Fri Nov 02 18:49:15 2007 +0000
+++ b/SUNWevolution-data-server.spec	Mon Nov 05 05:10:09 2007 +0000
@@ -86,10 +86,8 @@
 gzcat %SOURCE2 | tar xf -
 
 %build
-#FIXME: symbol clash in the evo libraries means we can't use -Bdirect
-#       should be re-enabled once these issues are fixed
 export LD=/usr/ccs/bin/ld
-export LDFLAGS="-Wl,-z,ignore %{?arch_ldadd} -L%{_libdir} -R%{_libdir}"
+export LDFLAGS="%_ldflags -L%{_libdir} -R%{_libdir}"
 export CFLAGS="%optflags"
 export RPM_OPT_FLAGS="$CFLAGS"
 export PKG_CONFIG_PATH="%{_pkg_config_path}"
@@ -155,6 +153,8 @@
 %endif
 
 %changelog
+* Mon Nov 05 2007 - [email protected]
+- Use system ldflag to enable -BDirect 
 * Fri Sep 28 2007 - [email protected]
 - delete -I%{_includedir} from CFLAGS -- it's redundant but breaks the
   indiana build; add %{?arch_ldadd} to LDFLAGS for iconv LDFLAGS

--- a/SUNWevolution.spec	Fri Nov 02 18:49:15 2007 +0000
+++ b/SUNWevolution.spec	Mon Nov 05 05:10:09 2007 +0000
@@ -111,10 +111,8 @@
 cp %SOURCE1 %{_builddir}/%name-%version/evolution-%{evolution.version}
 
 %build
-#FIXME: symbol clash in the evo libraries means we can't use -Bdirect
-#       should be re-enabled once these issues are fixed
 export LD=/usr/ccs/bin/ld 
-export LDFLAGS="%{?arch_ldadd} -Wl,-z,ignore -L%{_libdir} -R%{_libdir}"
+export LDFLAGS="%_ldflags -L%{_libdir} -R%{_libdir}"
 export CFLAGS="%optflags"
 %if %option_with_gnu_iconv
 export CFLAGS="$CFLAGS -I/usr/gnu/include -L/usr/gnu/lib -R/usr/gnu/lib"
@@ -290,6 +288,8 @@
 %{_sysconfdir}/gconf/schemas/evolution-mail.schemas
 
 %changelog
+* Mon Nov  5 2007 - [email protected]
+- Use system ldflag to enable -Bdirect
 * Wed Oct 31 2006 - [email protected]
 - Put the /usr/gnu references inside '%if %option_with_gnu_iconv' test.
 * Wed Oct 31 2006 - [email protected]