rpms/gettext/F-12 gettext-0.17-long-long-int-m4.patch, NONE, 1.1 gettext-0.17-rpathFix.patch, 1.2, 1.3 gettext.spec, 1.100, 1.101

[Jens Petersen]

Author: petersen

Update of /cvs/pkgs/rpms/gettext/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3836

Modified Files:
	gettext-0.17-rpathFix.patch gettext.spec 
Added Files:
	gettext-0.17-long-long-int-m4.patch 
Log Message:
backport FTBFS fixes from rawhide

gettext-0.17-long-long-int-m4.patch:
 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE gettext-0.17-long-long-int-m4.patch ---
diff -up ./gettext-runtime/libasprintf/configure.ac.rpathFix~ ./gettext-runtime/libasprintf/configure.ac
--- ./gettext-runtime/libasprintf/configure.ac.~	2007-10-08 05:37:36.000000000 +1000
+++ ./gettext-runtime/libasprintf/configure.ac	2008-08-28 16:43:18.000000000 +1000
@@ -54,7 +54,8 @@ dnl Checks for header files.
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
 AC_TYPE_SIZE_T
-gl_AC_TYPE_LONG_LONG
+AC_TYPE_LONG_LONG_INT
+#gl_AC_TYPE_LONG_LONG
 gt_TYPE_LONGDOUBLE
 gt_TYPE_WCHAR_T
 gt_TYPE_WINT_T

gettext-0.17-rpathFix.patch:
 gettext-tools/gnulib-tests/Makefile.gnulib |    2 +-
 gettext-tools/tests/Makefile.am            |    1 +
 m4/libtool.m4                              |   25 ++++++++++++++++---------
 3 files changed, 18 insertions(+), 10 deletions(-)

Index: gettext-0.17-rpathFix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/F-12/gettext-0.17-rpathFix.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gettext-0.17-rpathFix.patch	29 Aug 2008 00:19:30 -0000	1.2
+++ gettext-0.17-rpathFix.patch	8 Dec 2009 08:02:22 -0000	1.3
@@ -1,16 +1,3 @@
-diff -up ./gettext-runtime/libasprintf/configure.ac.rpathFix~ ./gettext-runtime/libasprintf/configure.ac
---- ./gettext-runtime/libasprintf/configure.ac.rpathFix~	2007-10-08 05:37:36.000000000 +1000
-+++ ./gettext-runtime/libasprintf/configure.ac	2008-08-28 16:43:18.000000000 +1000
-@@ -54,7 +54,8 @@ dnl Checks for header files.
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_INLINE
- AC_TYPE_SIZE_T
--gl_AC_TYPE_LONG_LONG
-+AC_TYPE_LONG_LONG_INT
-+#gl_AC_TYPE_LONG_LONG
- gt_TYPE_LONGDOUBLE
- gt_TYPE_WCHAR_T
- gt_TYPE_WINT_T
 diff -up ./gettext-tools/gnulib-tests/Makefile.gnulib.rpathFix~ ./gettext-tools/gnulib-tests/Makefile.gnulib
 --- ./gettext-tools/gnulib-tests/Makefile.gnulib.rpathFix~	2007-10-28 01:39:18.000000000 +1000
 +++ ./gettext-tools/gnulib-tests/Makefile.gnulib	2008-08-28 16:43:18.000000000 +1000
@@ -19,30 +6,10 @@ diff -up ./gettext-tools/gnulib-tests/Ma
  SUBDIRS =
  TESTS =
 -TESTS_ENVIRONMENT =
-+TESTS_ENVIRONMENT = LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:../../../../../lib:../../../../../lib64'
++TESTS_ENVIRONMENT = LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:'
  noinst_PROGRAMS =
  check_PROGRAMS =
  noinst_HEADERS =
-diff -up ./gettext-tools/src/Makefile.am.rpathFix~ ./gettext-tools/src/Makefile.am
---- ./gettext-tools/src/Makefile.am.rpathFix~	2007-10-08 05:37:38.000000000 +1000
-+++ ./gettext-tools/src/Makefile.am	2008-08-28 17:16:45.000000000 +1000
-@@ -62,6 +62,7 @@ projectsdir = $(pkgdatadir)/projects
- pkglibdir = $(libdir)/gettext
- 
- AM_CPPFLAGS = \
-+  -I../../../../../../usr/include \
-   -I. -I$(srcdir) \
-   -I.. -I$(top_srcdir) \
-   -I$(top_srcdir)/libgrep \
-@@ -82,7 +83,7 @@ LDADD = ../gnulib-lib/libgettextlib.la @
- 
- SED = sed
- YACC = @YACC@ -d
--GCJ = @GCJ@
-+GCJ = gcj
- GCJFLAGS = @GCJFLAGS@
- JAR = @JAR@
- JAVACOMP = $(SHELL) ../javacomp.sh
 diff -up ./gettext-tools/tests/Makefile.am.rpathFix~ ./gettext-tools/tests/Makefile.am
 --- ./gettext-tools/tests/Makefile.am.rpathFix~	2007-10-21 07:54:40.000000000 +1000
 +++ ./gettext-tools/tests/Makefile.am	2008-08-28 16:43:18.000000000 +1000
@@ -50,7 +17,7 @@ diff -up ./gettext-tools/tests/Makefile.
  		    LOCALE_JA='@LOCALE_JA@' \
  		    host_os='@host_os@' \
  		    CONFIG_SHELL='$(SHELL)' \
-+		    LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:../../../../../lib:../../../../../lib64' \
++		    LD_LIBRARY_PATH='../intl/.libs:../src/.libs:../.libs:' \
  		    $(SHELL)
  
  xg-c-1.ok.po: $(top_srcdir)/src/xgettext.c $(top_srcdir)/src/msgfmt.c


Index: gettext.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gettext/F-12/gettext.spec,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -p -r1.100 -r1.101
--- gettext.spec	1 Sep 2009 07:38:51 -0000	1.100
+++ gettext.spec	8 Dec 2009 08:02:22 -0000	1.101
@@ -5,13 +5,14 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.17
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv3 and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
 Source2: msghack.py
-BuildRequires: autoconf >= 2.5
+# removal of openmp.m4
+BuildRequires: autoconf >= 2.62
 BuildRequires: automake
 BuildRequires: libtool, bison, gcc-c++
 %if %{with java}
@@ -36,6 +37,7 @@ Patch5: gettext-0.17-open-args.patch
 Patch6: gettext-0.17-autopoint-CVS-441481.patch
 Patch7: gettext-0.17-rpathFix.patch
 Patch8: gettext-xgettext-python-unicode-surrogate-473946.patch
+Patch9: gettext-0.17-long-long-int-m4.patch
 
 %description
 The GNU gettext package provides a set of tools and documentation for
@@ -82,8 +84,12 @@ This package contains libraries used int
 %patch6 -p0 -b .6-autopoint~
 %patch7 -p0 -b .rpathFix~
 %patch8 -p0 -b .unicode~
+%patch9 -p0 -b .longlong~
 
-./autogen.sh
+# necessary for autoconf >= 2.6.2:
+rm gettext-tools/gnulib-m4/openmp.m4
+
+./autogen.sh --quick --skip-gnulib
 
 
 %build
@@ -268,6 +274,13 @@ fi
 
 
 %changelog
+* Fri Nov 27 2009 Jens Petersen <petersen at redhat.com> - 0.17-16
+- fix FTBFS by removing openmp.m4 which conflicts with recent autoconf (#539211)
+- cleanup gettext-0.17-rpathFix.patch
+  - separate gl_AC_TYPE_LONG_LONG replacement to another patch
+  - use trailing ':' for tests LD_LIBRARY_PATH
+- run autogen.sh with --quick and --skip-gnulib
+
 * Tue Sep  1 2009 Jens Petersen <petersen at redhat.com> - 0.17-15
 - bring back autopoint requires cvs (#517361)
 - requires info rather than /sbin/install-info