- buildrequire expat-devel

- add gettext-xglade-include-expat-285701.patch to include expat.h to get
    xgettext to dl the right libexpat (Nils Philippsen, #285701)

gettext-xglade-include-expat-285701.patch

@@ -0,0 +1,17 @@
+diff -up gettext-0.16.1/gettext-tools/src/x-glade.c~ gettext-0.16.1/gettext-tools/src/x-glade.c
+--- gettext-0.16.1/gettext-tools/src/x-glade.c~	2006-11-28 03:02:08.000000000 +1000
++++ gettext-0.16.1/gettext-tools/src/x-glade.c	2007-09-12 22:40:26.000000000 +1000
+@@ -28,10 +28,9 @@
+ #include <string.h>
+ #if DYNLOAD_LIBEXPAT
+ # include <dlfcn.h>
+-#else
+-# if HAVE_LIBEXPAT
+-#  include <expat.h>
+-# endif
++#endif
++#if HAVE_LIBEXPAT
++# include <expat.h>
+ #endif
+ 
+ #include "message.h"

gettext.spec

@@ -4,7 +4,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.16.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -17,6 +17,8 @@ Requires(preun): /sbin/install-info
 BuildRequires: automake >= 1.8, autoconf >= 2.5
 %endif
 BuildRequires: libtool, bison, gcc-c++, gcc-java, libgcj
+# need expat for xgettext on glade
+Buildrequires: expat-devel
 %if %{buildjar}
 BuildRequires: %{_bindir}/fastjar
 # require zip and unzip for brp-java-repack-jars
@@ -26,6 +28,7 @@ Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Patch1: gettext-tools-tests-lang-gawk-fail.patch
 Patch2: gettext-php-headers.patch
 Patch3: gettext-php-prinf-output-237241.patch
+Patch4: gettext-xglade-include-expat-285701.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -62,6 +65,7 @@ want to add gettext support for your project.
 %patch1 -p1 -b .1-fails~
 %patch2 -p0 -b .2-header~
 %patch3 -p1 -b .3-printf~
+%patch4 -p1 -b .4-expat~
 
 
 %build
@@ -227,6 +231,11 @@ fi
 
 
 %changelog
+* Wed Sep 12 2007 Jens Petersen <petersen@redhat.com> - 0.16.1-10
+- buildrequire expat-devel
+- add gettext-xglade-include-expat-285701.patch to include expat.h
+  to get xgettext to dl the right libexpat (Nils Philippsen, #285701)
+
 * Thu Aug 16 2007 Jens Petersen <petersen@redhat.com>
 - specify license is GPL and LGPL version 2 or later