--- a/ChangeLog	Thu Oct 04 19:19:19 2007 +0000
+++ b/ChangeLog	Thu Oct 04 19:22:18 2007 +0000
@@ -1,3 +1,10 @@
+2007-10-04  Laszlo (Laca) Peter  <[email protected]>
+
+	* SUNWevolution.spec: delete -I %{_includedir} from CFLAGS -- breaks
+	  the indiana build because the wrong iconv.h is picked up;
+	  otherwise it's useless.  Probably left behind from the times
+	  when evolution was in /usr/sfw
+
 2007-10-04  Laszlo (Laca) Peter  <[email protected]>
 
 	* ext-sources/l10n-configure.sh: fix regexp in sed command to work

--- a/SUNWevolution.spec	Thu Oct 04 19:19:19 2007 +0000
+++ b/SUNWevolution.spec	Thu Oct 04 19:22:18 2007 +0000
@@ -114,7 +114,7 @@
 #       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 CFLAGS="-I%{_includedir} %optflags"
+export CFLAGS="%optflags"
 export RPM_OPT_FLAGS="$CFLAGS"
 export PERL=/usr/perl5/bin/perl
 export PKG_CONFIG_PATH=%{_pkg_config_path}:%{_builddir}/%name-%version/evolution-%{evolution.version}
@@ -286,6 +286,9 @@
 %{_sysconfdir}/gconf/schemas/evolution-mail.schemas
 
 %changelog
+* Thu Oct  4 2007 - [email protected]
+- 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]
 - Add a new schemas files to %files and remove version number from another.
 * Wed Jul 11 2007 - [email protected]