Update to 0.18.3.2-5

gettext-autopoint-infloop.patch

@@ -0,0 +1,65 @@
+From d75090f27cf150267bd59a9e1be42ec51bfb7b0e Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Fri, 10 Oct 2014 07:31:46 +0900
+Subject: [PATCH] autopoint: Fix infinite recursion when tracing configure.ac
+
+Reported by Andreas Henriksson at:
+<https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=764580>
+* autopoint.in (func_trace_autoconf): Temporarily redefine
+built-in macros, instead of undefining.
+* gettextize.in: Likewise.
+---
+ gettext-tools/misc/autopoint.in  | 18 +++++++++---------
+ gettext-tools/misc/gettextize.in | 18 +++++++++---------
+ 2 files changed, 18 insertions(+), 18 deletions(-)
+
+Index: gettext-0.18.3.2/gettext-tools/misc/autopoint.in
+===================================================================
+--- gettext-0.18.3.2.orig/gettext-tools/misc/autopoint.in
++++ gettext-0.18.3.2/gettext-tools/misc/autopoint.in
+@@ -142,13 +142,13 @@ func_trace ()
+ {
+   echo '\
+ dnl disable macros which may abort autom4te
+-m4_undefine([m4_assert])
+-m4_undefine([m4_fatal])
+-m4_undefine([m4_warn])
+-m4_undefine([m4_errprintn])
+-m4_undefine([m4_exit])
+-m4_undefine([m4_include])
+-m4_undefine([m4_esyscmd])
++m4_pushdef([m4_assert])
++m4_pushdef([m4_fatal])
++m4_pushdef([m4_warn])
++m4_pushdef([m4_errprintn])
++m4_pushdef([m4_exit])
++m4_pushdef([m4_include])
++m4_pushdef([m4_esyscmd])
+ dnl macros which needs to be traced without aclocal.m4
+ m4_define([AM_GNU_GETTEXT], [])
+ m4_define([AM_GNU_GETTEXT_VERSION], [])
+Index: gettext-0.18.3.2/gettext-tools/misc/gettextize.in
+===================================================================
+--- gettext-0.18.3.2.orig/gettext-tools/misc/gettextize.in
++++ gettext-0.18.3.2/gettext-tools/misc/gettextize.in
+@@ -142,13 +142,13 @@ func_trace ()
+ {
+   echo '\
+ dnl disable macros which may abort autom4te
+-m4_undefine([m4_assert])
+-m4_undefine([m4_fatal])
+-m4_undefine([m4_warn])
+-m4_undefine([m4_errprintn])
+-m4_undefine([m4_exit])
+-m4_undefine([m4_include])
+-m4_undefine([m4_esyscmd])
++m4_pushdef([m4_assert])
++m4_pushdef([m4_fatal])
++m4_pushdef([m4_warn])
++m4_pushdef([m4_errprintn])
++m4_pushdef([m4_exit])
++m4_pushdef([m4_include])
++m4_pushdef([m4_esyscmd])
+ dnl macros which needs to be traced without aclocal.m4
+ m4_define([AM_GNU_GETTEXT], [])
+ m4_define([AM_GNU_GETTEXT_VERSION], [])

gettext-grep-options.patch

@@ -0,0 +1,48 @@
+From d70724a34ca4d4f26e588ec5c300820bc1f2822d Mon Sep 17 00:00:00 2001
+From: Daiki Ueno <ueno@gnu.org>
+Date: Wed, 23 Apr 2014 11:57:14 +0900
+Subject: [PATCH] autopoint: Unset variables known to interfere with common
+ tools
+
+Reported by Jan Cholasta at:
+<https://bugzilla.redhat.com/show_bug.cgi?id=801374>.
+* autopoint.in: Unset CDPATH, CLICOLOR_FORCE, and GREP_OPTIONS.
+* gettextize.in: Unset CLICOLOR_FORCE and GREP_OPTIONS.
+---
+ gettext-tools/misc/autopoint.in  | 7 +++++++
+ gettext-tools/misc/gettextize.in | 4 ++++
+ 2 files changed, 11 insertions(+)
+
+Index: gettext-0.18.3.2/gettext-tools/misc/autopoint.in
+===================================================================
+--- gettext-0.18.3.2.orig/gettext-tools/misc/autopoint.in
++++ gettext-0.18.3.2/gettext-tools/misc/autopoint.in
+@@ -200,6 +200,13 @@ func_fatal_error ()
+   exit 1
+ }
+ 
++# Nuisances.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++# Unset more variables known to interfere with behavior of common tools.
++CLICOLOR_FORCE= GREP_OPTIONS=
++unset CLICOLOR_FORCE GREP_OPTIONS
++
+ # Command-line option processing.
+ # Removes the OPTIONS from the arguments. Sets the variables:
+ # - force           yes if --force was given, empty otherwise
+Index: gettext-0.18.3.2/gettext-tools/misc/gettextize.in
+===================================================================
+--- gettext-0.18.3.2.orig/gettext-tools/misc/gettextize.in
++++ gettext-0.18.3.2/gettext-tools/misc/gettextize.in
+@@ -203,6 +203,10 @@ func_fatal_error ()
+ # Nuisances.
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
++# Unset more variables known to interfere with behavior of common tools.
++CLICOLOR_FORCE= GREP_OPTIONS=
++unset CLICOLOR_FORCE GREP_OPTIONS
++
+ # Command-line option processing.
+ # Removes the OPTIONS from the arguments. Sets the variables:
+ # - force           1 if --force was given, 0 otherwise

gettext.spec

@@ -6,7 +6,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.18.3.2
-Release: 1%{?dist}
+Release: 5%{?dist}
 License: GPLv3+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
@@ -14,6 +14,8 @@ Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
 Source2: msghack.py
 Source3: msghack.1
 Patch0: gettext-gnulib-tests-format-security.patch
+Patch1: gettext-autopoint-infloop.patch
+Patch2:	gettext-grep-options.patch
 # removal of openmp.m4
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake
@@ -87,8 +89,11 @@ Requires: %{name}-libs = %{version}-%{release}
 Requires: %{name}-common-devel = %{version}-%{release}
 Requires(post): info
 Requires(preun): info
+%if %{with git}
 # for autopoint
 Requires: git
+%endif
+Requires: autoconf
 Obsoletes: gettext-autopoint < 0.18.1.1-3
 Provides: gettext-autopoint = %{version}-%{release}
 
@@ -136,6 +141,8 @@ Emacs.
 %prep
 %setup -q
 %patch0 -p1 -b .gnulib-tests-format-security
+%patch1 -p1 -b .autopoint-infloop
+%patch2 -p1 -b .grep-options
 
 
 %build
@@ -331,6 +338,18 @@ fi
 %{_emacs_sitelispdir}/%{name}/*.el
 
 %changelog
+* Thu Jan  8 2015 Daiki Ueno <dueno@redhat.com> - 0.18.3.2-5
+- apply patch to unset GREP_OPTIONS in autopoint (#801374)
+
+* Mon Jan  5 2015 Daiki Ueno <dueno@redhat.com> - 0.18.3.2-4
+- remove git dependency from -devel subpackage (#1161284)
+
+* Thu Nov 13 2014 Daiki Ueno <dueno@redhat.com> - 0.18.3.2-3
+- add autoconf requirement to -devel for autopoint (#1161554)
+
+* Fri Oct 10 2014 Daiki Ueno <dueno@redhat.com> - 0.18.3.2-2
+- apply patch to avoid autopoint infinite recursion (#1151238)
+
 * Tue Jan  7 2014 Daiki Ueno <dueno@redhat.com> - 0.18.3.2-1
 - update to 0.18.3.2 release
 - apply patch to suppress -Wformat-security warnings in gnulib-tests