From 62ecc80b426abc61d3658f2ccb6daa2c9c0f56a3 Mon Sep 17 00:00:00 2001
From: Dominic Cleal <dominic@cleal.org>
Date: Tue, 21 Mar 2017 14:04:11 +0000
Subject: [PATCH] Disable gnulib test-lock, which hangs during check

Related to BZ#1410052, BZ#1406031, and
https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/PQD576JZLERFY6ROI3GF7UYXKZIRI33G/
---
 augeas.spec                    |  3 +++
 gnulib-disable-test-lock.patch | 40 ++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 gnulib-disable-test-lock.patch

diff --git a/augeas.spec b/augeas.spec
index cde4937..b5ea76d 100644
--- a/augeas.spec
+++ b/augeas.spec
@@ -7,6 +7,8 @@ Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://augeas.net/
 Source0:        http://download.augeas.net/%{name}-%{version}.tar.gz
+# Disable gnulib test-lock, which hangs during check (related to BZ#1410052, BZ#1406031)
+Patch0:         gnulib-disable-test-lock.patch
 
 BuildRequires:  readline-devel libselinux-devel libxml2-devel
 Requires:       %{name}-libs = %{version}-%{release}
@@ -46,6 +48,7 @@ read files.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
diff --git a/gnulib-disable-test-lock.patch b/gnulib-disable-test-lock.patch
new file mode 100644
index 0000000..43d1b15
--- /dev/null
+++ b/gnulib-disable-test-lock.patch
@@ -0,0 +1,40 @@
+diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.am augeas-1.8.0/gnulib/tests/Makefile.am
+--- augeas-1.8.0.old/gnulib/tests/Makefile.am	2016-09-29 20:15:19.000000000 +0100
++++ augeas-1.8.0/gnulib/tests/Makefile.am	2017-03-21 15:14:45.209782946 +0000
+@@ -515,15 +515,6 @@
+ 
+ ## end   gnulib module localename-tests
+ 
+-## begin gnulib module lock-tests
+-
+-TESTS += test-lock
+-check_PROGRAMS += test-lock
+-test_lock_LDADD = $(LDADD) @LIBMULTITHREAD@ @YIELD_LIB@
+-EXTRA_DIST += test-lock.c
+-
+-## end   gnulib module lock-tests
+-
+ ## begin gnulib module lstat-tests
+ 
+ TESTS += test-lstat
+diff -ru augeas-1.8.0.old/gnulib/tests/Makefile.in augeas-1.8.0/gnulib/tests/Makefile.in
+--- augeas-1.8.0.old/gnulib/tests/Makefile.in	2017-03-20 22:17:04.000000000 +0000
++++ augeas-1.8.0/gnulib/tests/Makefile.in	2017-03-21 15:15:05.211646356 +0000
+@@ -126,7 +126,7 @@
+ 	test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
+ 	test-limits-h$(EXEEXT) test-locale$(EXEEXT) \
+ 	test-localeconv$(EXEEXT) test-localename$(EXEEXT) \
+-	test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
++	test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
+ 	test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
+ 	test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc-w32-1.sh \
+ 	test-mbrtowc-w32-2.sh test-mbrtowc-w32-3.sh \
+@@ -170,7 +170,7 @@
+ 	test-isblank$(EXEEXT) test-langinfo$(EXEEXT) \
+ 	test-limits-h$(EXEEXT) test-locale$(EXEEXT) \
+ 	test-localeconv$(EXEEXT) test-localename$(EXEEXT) \
+-	test-lock$(EXEEXT) test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
++	test-lstat$(EXEEXT) test-malloca$(EXEEXT) \
+ 	test-mbrtowc$(EXEEXT) test-mbrtowc-w32$(EXEEXT) \
+ 	test-mbsinit$(EXEEXT) test-mbsrtowcs$(EXEEXT) \
+ 	test-memchr$(EXEEXT) test-nl_langinfo$(EXEEXT) \