rpms/gettext/devel gettext-xglade-define-xml-major-version-285701.patch, NONE, 1.1 gettext.spec, 1.77, 1.78 gettext-xglade-include-expat-285701.patch, 1.1, NONE

[Nils Philippsen (nphilipp)]

Author: nphilipp

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

Modified Files:
	gettext.spec 
Added Files:
	gettext-xglade-define-xml-major-version-285701.patch 
Removed Files:
	gettext-xglade-include-expat-285701.patch 
Log Message:
remove gettext-xglade-include-expat-285701.patch, add gettext-xglade-define-xml-major-version-285701.patch to determine XML_MAJOR_VERSION from expat.h and define it in config.h (#285701)


gettext-xglade-define-xml-major-version-285701.patch:

--- NEW FILE gettext-xglade-define-xml-major-version-285701.patch ---
diff -up gettext-0.16.1/gettext-tools/configure.ac.4-expat~ gettext-0.16.1/gettext-tools/configure.ac
--- gettext-0.16.1/gettext-tools/configure.ac.4-expat~	2006-11-27 18:02:01.000000000 +0100
+++ gettext-0.16.1/gettext-tools/configure.ac	2007-09-14 13:55:28.000000000 +0200
@@ -238,6 +238,22 @@ case "$host_os" in
     LTLIBEXPAT="-ldl"
     AC_SUBST(LIBEXPAT)
     AC_SUBST(LTLIBEXPAT)
+    AC_CHECK_HEADER([expat.h],[
+        cat > xml_major_version.c << EOF
+#include <stdio.h>
+#include <expat.h>
+int main (void) { printf ("%d\n", XML_MAJOR_VERSION); }
+EOF
+        AC_MSG_CHECKING([for libexpat XML_MAJOR_VERSION])
+        $CC -o xml_major_version xml_major_version.c
+        XML_MAJOR_VERSION=$(./xml_major_version)
+        rm -f ./xml_major_version ./xml_major_version.c
+        AC_MSG_RESULT([$XML_MAJOR_VERSION])
+        AC_SUBST(XML_MAJOR_VERSION)
+        AC_DEFINE([XML_MAJOR_VERSION],$XML_MAJOR_VERSION,[The API version of the expat library found during compilation.])
+    ],[
+        AC_ERROR([cannot determine version of expat library, expat.h is missing])
+    ])
     ;;
   *)
     AC_LIB_HAVE_LINKFLAGS([expat], [],


Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- gettext.spec	12 Sep 2007 12:49:55 -0000	1.77
+++ gettext.spec	14 Sep 2007 12:19:34 -0000	1.78
@@ -4,7 +4,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.16.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -14,8 +14,9 @@
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 %ifarch x86_64 ppc64 s390x
-BuildRequires: automake >= 1.8, autoconf >= 2.5
+BuildRequires: automake >= 1.8
 %endif
+BuildRequires: autoconf >= 2.5
 BuildRequires: libtool, bison, gcc-c++, gcc-java, libgcj
 # need expat for xgettext on glade
 Buildrequires: expat-devel
@@ -28,7 +29,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
+Patch4: gettext-xglade-define-xml-major-version-285701.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -69,6 +70,11 @@
 
 
 %build
+pushd gettext-tools
+autoconf
+autoheader
+popd
+
 [ -f  %{_datadir}/automake/depcomp ] && cp -f %{_datadir}/automake/{depcomp,ylwrap} .
 
 export JAVAC=gcj
@@ -231,6 +237,11 @@
 
 
 %changelog
+* Fri Sep 14 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-11
+- remove gettext-xglade-include-expat-285701.patch, add
+  gettext-xglade-define-xml-major-version-285701.patch to determine
+  XML_MAJOR_VERSION from expat.h and define it in config.h (#285701)
+
 * 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


--- gettext-xglade-include-expat-285701.patch DELETED ---