From 63036c0a24ddab039b37c8b9d4254d7975f2d5c5 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Dec 21 2016 12:26:33 +0000
Subject: tests: disable 'test-lock' for gettext-tools too


Related: rhbz#1406031
Version: 0.19.8.1-6

---

diff --git a/disable-gettext-runtime-test-lock.patch b/disable-gettext-runtime-test-lock.patch
index b59f170..ec3a59b 100644
--- a/disable-gettext-runtime-test-lock.patch
+++ b/disable-gettext-runtime-test-lock.patch
@@ -1,8 +1,16 @@
-Index: gettext-0.19.7/gettext-runtime/tests/Makefile.am
-===================================================================
---- gettext-0.19.7.orig/gettext-runtime/tests/Makefile.am
-+++ gettext-0.19.7/gettext-runtime/tests/Makefile.am
-@@ -20,7 +20,7 @@
+commit bd2c6ca2b7ae0be02d4bb85db79def454f3153fb
+Author:     rpm-build <rpm-build>
+AuthorDate: Wed Dec 21 12:50:54 2016 +0100
+Commit:     rpm-build <rpm-build>
+CommitDate: Wed Dec 21 12:52:36 2016 +0100
+
+    disable-gettext-runtime-test-lock.patch
+
+diff --git a/gettext-runtime/tests/Makefile.am b/gettext-runtime/tests/Makefile.am
+index 88a0684..3a27b79 100644
+--- a/gettext-runtime/tests/Makefile.am
++++ b/gettext-runtime/tests/Makefile.am
+@@ -19,7 +19,7 @@
  AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests subdir-objects
  EXTRA_DIST =
  
@@ -11,10 +19,10 @@ Index: gettext-0.19.7/gettext-runtime/tests/Makefile.am
  
  AM_CPPFLAGS = \
    -I.. \
-Index: gettext-0.19.7/gettext-runtime/tests/Makefile.in
-===================================================================
---- gettext-0.19.7.orig/gettext-runtime/tests/Makefile.in
-+++ gettext-0.19.7/gettext-runtime/tests/Makefile.in
+diff --git a/gettext-runtime/tests/Makefile.in b/gettext-runtime/tests/Makefile.in
+index 4327733..5879146 100644
+--- a/gettext-runtime/tests/Makefile.in
++++ b/gettext-runtime/tests/Makefile.in
 @@ -86,7 +86,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
@@ -24,3 +32,16 @@ Index: gettext-0.19.7/gettext-runtime/tests/Makefile.in
  check_PROGRAMS = test-lock$(EXEEXT)
  subdir = tests
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+diff --git a/gettext-tools/gnulib-tests/Makefile.in b/gettext-tools/gnulib-tests/Makefile.in
+index 26becd9..4b9d0e4 100644
+--- a/gettext-tools/gnulib-tests/Makefile.in
++++ b/gettext-tools/gnulib-tests/Makefile.in
+@@ -143,7 +143,7 @@ TESTS = test-set-mode-acl.sh test-set-mode-acl-1.sh \
+ 	test-isnanl-nolibm$(EXEEXT) test-isnanl$(EXEEXT) \
+ 	test-iswblank$(EXEEXT) test-langinfo$(EXEEXT) \
+ 	test-linkedhash_list$(EXEEXT) test-locale$(EXEEXT) \
+-	test-localename$(EXEEXT) test-lock$(EXEEXT) \
++	test-localename$(EXEEXT) \
+ 	test-log10$(EXEEXT) test-lseek.sh test-lstat$(EXEEXT) \
+ 	test-malloca$(EXEEXT) test-math$(EXEEXT) test-mbrtowc1.sh \
+ 	test-mbrtowc2.sh test-mbrtowc3.sh test-mbrtowc4.sh \
diff --git a/gettext.spec b/gettext.spec
index fe92943..bbf065c 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -9,7 +9,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages
 Name: gettext
 Version: 0.19.8.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv3+ and LGPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/gettext/
@@ -358,6 +358,9 @@ fi
 %{_mandir}/man1/msghack.1*
 
 %changelog
+* Wed Dec 21 2016 Pavel Raiskup <praiskup@redhat.com> - 0.19.8.1-6
+- disable test-lock for 'gettext-tool' subdir too (rhbz#1406031)
+
 * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.19.8.1-5
 - Rebuild for Python 3.6