--- a/ChangeLog	Thu Oct 04 22:41:07 2007 +0000
+++ b/ChangeLog	Thu Oct 04 22:46:53 2007 +0000
@@ -1,5 +1,7 @@
 2007-10-04  Laszlo (Laca) Peter  <[email protected]>
 
+	* SUNWevolution.spec: add %arch_ldadd to LDFLAGS so that the
+	  GNU libiconv flags are used
 	* SUNWgnome-desktop-prefs.spec: add -D_POSIX_PTHREAD_SEMANTICS
 	  to CFLAGS to unbreak compilation of gnome-about-me.c
 	  (getpwuid_r call in get_user_login)

--- a/SUNWevolution.spec	Thu Oct 04 22:41:07 2007 +0000
+++ b/SUNWevolution.spec	Thu Oct 04 22:46:53 2007 +0000
@@ -113,7 +113,7 @@
 #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 -L%{_libdir} -R%{_libdir}"
+export LDFLAGS="%{?arch_ldadd} -Wl,-z,ignore -L%{_libdir} -R%{_libdir}"
 export CFLAGS="%optflags"
 export RPM_OPT_FLAGS="$CFLAGS"
 export PERL=/usr/perl5/bin/perl
@@ -287,6 +287,7 @@
 
 %changelog
 * Thu Oct  4 2007 - [email protected]
+- add %arch_ldadd to LDFLAGS so that the GNU libiconv flags are used
 - delete -I %{_includedir} from CFLAGS -- breaks the indiana build because
   the wrong iconv.h is picked up; otherwise it's useless
 * Tue Aug 28 2007 - [email protected]