rpms/gettext/devel gettext-xglade-include-expat-285701.patch, NONE, 1.1 gettext.spec, 1.76, 1.77

[Jens Petersen (petersen)]

Author: petersen

Update of /cvs/pkgs/rpms/gettext/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31049

Modified Files:
	gettext.spec 
Added Files:
	gettext-xglade-include-expat-285701.patch 
Log Message:
- 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:

--- NEW FILE gettext-xglade-include-expat-285701.patch ---
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"


Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gettext.spec	16 Aug 2007 04:10:48 -0000	1.76
+++ gettext.spec	12 Sep 2007 12:49:55 -0000	1.77
@@ -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 @@
 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 @@
 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 @@
 %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 @@
 
 
 %changelog
+* Wed Sep 12 2007 Jens Petersen <petersen at 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 at redhat.com>
 - specify license is GPL and LGPL version 2 or later