--- a/ChangeLog	Wed Jul 25 16:49:58 2007 +0000
+++ b/ChangeLog	Fri Jul 27 08:28:50 2007 +0000
@@ -1,3 +1,9 @@
+2007-07-27  Damien Carbery <[email protected]>
+
+	* SUNWgnome-base-libs.spec: Add "-I/usr/X11/share/include" to
+	  EXTRA_CFLAGS because SUNWxwxft changed location of Xft.h (again!) in
+	  snv_69.
+
 2007-07-25  Dermot McCluskey <[email protected]>
 
 	==== JDS Nevada build 70c ====

--- a/SUNWgnome-base-libs.spec	Wed Jul 25 16:49:58 2007 +0000
+++ b/SUNWgnome-base-libs.spec	Fri Jul 27 08:28:50 2007 +0000
@@ -159,7 +159,7 @@
 %ifarch amd64 sparcv9
 export EXTRA_LDFLAGS="-L/usr/sfw/lib/%{_arch64} -R/usr/sfw/lib/%{_arch64} -L/usr/X11/lib/%{_arch64} -R/usr/X11/lib/%{_arch64} -L%{_builddir}/%name-%version/%{_arch64}/cairo-%{cairo.version}/src/.libs"
 export PATH=%{_builddir}/%name-%version/%{_arch64}/glib-%{glib.version}/gobject:$save_PATH
-export EXTRA_CFLAGS="-I/usr/openwin/include -I/usr/sfw/include/freetype2 -I/usr/sfw/include -I%{_builddir}/%name-%version/%{_arch64}/cairo-%{cairo.version}/src"
+export EXTRA_CFLAGS="-I/usr/X11/share/include -I/usr/openwin/include -I/usr/sfw/include/freetype2 -I/usr/sfw/include -I%{_builddir}/%name-%version/%{_arch64}/cairo-%{cairo.version}/src"
 
 %glib_64.build -d %name-%version/%_arch64
 %cairo_64.build -d %name-%version/%_arch64
@@ -432,6 +432,9 @@
 
 %changelog
 * Fri Jul 13 2007 - [email protected]
+- Add "-I/usr/X11/share/include" to EXTRA_CFLAGS because SUNWxwxft changed
+  location of Xft.h (again!) in snv_69.
+* Fri Jul 13 2007 - [email protected]
 - Add "-I/usr/openwin/include -I/usr/sfw/include/freetype2" to EXTRA_CFLAGS
   because SUNWxwxft changed the location of Xft.h in snv_68.
 * Thu Mar 15 2007 - [email protected]