--- a/SUNWgnome-games.spec	Fri Jan 18 18:55:20 2008 +0000
+++ b/SUNWgnome-games.spec	Sun Jan 20 17:39:58 2008 +0000
@@ -79,7 +79,15 @@
 export PATH="$PATH:"`dirname $CXX`
 export CXX=`basename $CXX`
 export ACLOCAL_FLAGS="-I /usr/share/aclocal"
-export XGETTEXT=`which xgettext`
+
+# find GNU xgettext
+IFS=:
+for dir in $PATH; do
+  test -x "$dir/xgettext" && \
+       "$dir/xgettext" --version 2>&1 | egrep -s 'GNU gettext' && \
+       XGETTEXT="$dir/xgettext"
+done
+export XGETTEXT
 
 %libggz.build -d %name-%version
 %ggz_client_libs.build -d %name-%version
@@ -238,7 +246,9 @@
 #%{_includedir}/*
 
 %changelog
-* Thu Jan 19 2008 - [email protected]
+* Sun Jan 20 2008 - [email protected]
+- Rework the XGETTEXT detection.
+* Thu Jan 17 2008 - [email protected]
 - Add export XGETTEXT=`which` to pickup GNU getetxt shipped by CBE
 * Wed Jan 09 2008 - [email protected]
 - Set ACLOCAL_FLAGS to pick up modified intltool.m4.