--- a/ChangeLog	Fri Oct 12 19:13:24 2007 +0000
+++ b/ChangeLog	Fri Oct 12 19:34:15 2007 +0000
@@ -1,3 +1,11 @@
+2007-10-12  Laszlo (Laca) Peter  <[email protected]>
+
+	* SUNWgnome-a11y-gok.spec: add /usr/X11/include to CFLAGS when
+	  built with FOX
+	* SUNWgnome-media-player.spec: add /usr/X11/include to CXXFLAGS
+	* SUNWgnome-display-mgr.spec: add x11 compile flags to CFLAGS if
+	  x11.pc exists (FOX fix)
+
 2007-10-12  Brian Cameron  <[email protected]>
 
 	* SUNWgnome-applets.spec, base-specs/gnome-applets.spec,

--- a/SUNWgnome-a11y-gok.spec	Fri Oct 12 19:13:24 2007 +0000
+++ b/SUNWgnome-a11y-gok.spec	Fri Oct 12 19:34:15 2007 +0000
@@ -71,6 +71,10 @@
 %else
 export CFLAGS="%optflags -xO2 -I%{_includedir}"
 %endif
+%if %option_with_fox
+# for <X11/extensions/XInput.h>
+export CFLAGS="$CFLAGS -I/usr/X11/include"
+%endif
 export RPM_OPT_FLAGS="$CFLAGS"
 %gok.build -d %name-%version
 
@@ -194,6 +198,8 @@
 %endif
 
 %changelog
+* Fri Oct 12 1007 - [email protected]
+- add /usr/X11/include to CFLAGS when built with FOX
 * Fri Sep 28 2007 - [email protected]
 - delete SUNWxwrtl dep
 * Mon May 28 2007 - [email protected]

--- a/SUNWgnome-display-mgr.spec	Fri Oct 12 19:13:24 2007 +0000
+++ b/SUNWgnome-display-mgr.spec	Fri Oct 12 19:34:15 2007 +0000
@@ -81,7 +81,9 @@
 %build
 export LDFLAGS="%_ldflags -L/usr/openwin/lib -lXau -R/usr/openwin/lib -R/usr/sfw/lib"
 export PKG_CONFIG_PATH=%{_pkg_config_path}
-export CFLAGS="%optflags"
+X11_CFLAGS=
+pkg-config --exists x11 && X11_CFLAGS=`pkg-config --cflags x11`
+export CFLAGS="%optflags $X11_CFLAGS"
 export RPM_OPT_FLAGS="$CFLAGS"
 %if %option_without_dt
 export GDMGNOMESESSIONCMD="/usr/bin/dtstart jds"
@@ -223,6 +225,8 @@
 %endif
 
 %changelog
+* Fri Oct 12 1007 - [email protected]
+- add x11 compile flags to CFLAGS if x11.pc exists (FOX fix)
 * Fri Sep 28 2007 - [email protected]
 - add support for building with FOX and using dtstart instead of
   dtlogin-integration

--- a/SUNWgnome-media-player.spec	Fri Oct 12 19:13:24 2007 +0000
+++ b/SUNWgnome-media-player.spec	Fri Oct 12 19:34:15 2007 +0000
@@ -95,7 +95,7 @@
 
 %build
 export CFLAGS="%optflags -D__EXTENSIONS__ -I%{_includedir} -I/usr/X11/include"
-export CXXFLAGS="%cxx_optflags -features=extensions"
+export CXXFLAGS="%cxx_optflags -features=extensions -I/usr/X11/include"
 %if %cc_is_gcc
 %else
 export CXX="${CXX} -norunpath"
@@ -260,6 +260,8 @@
 %endif
 
 %changelog
+* Fri Oct 12 2007 - [email protected]
+- add /usr/X11/include to CXXFLAGS
 * Thu Oct  4 2007 - [email protected]
 - add %arch_ldadd to LDFLAGS for the libintl libs
 * Tue Jul 03 2007 - [email protected]