From 2bc28062b089c0fd6a07d5d82da67c3d23badd12 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@redhat.com>
Date: Jan 26 2018 15:32:00 +0000
Subject: New upstream version 1.10.0 (RHBZ#1538846).


---

diff --git a/augeas.spec b/augeas.spec
index f5e17ab..4448490 100644
--- a/augeas.spec
+++ b/augeas.spec
@@ -1,5 +1,5 @@
 Name:           augeas
-Version:        1.9.0
+Version:        1.10.0
 Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
@@ -7,8 +7,6 @@ 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}
@@ -59,7 +57,6 @@ static builds using %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \
@@ -101,8 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_bindir}/augtool
+%{_bindir}/augmatch
 %{_bindir}/augparse
+%{_bindir}/augtool
 %{_bindir}/fadot
 %doc %{_mandir}/man1/*
 %{_datadir}/vim/vimfiles/syntax/augeas.vim
@@ -129,6 +127,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libfa.a
 
 %changelog
+* Fri Jan 26 2018 Richard W.M. Jones <rjones@redhat.com> - 1.10.0-1
+- New upstream version 1.10.0 (RHBZ#1538846).
+- Remove upstream patch.
+- New tool ‘augmatch’.
+
 * Tue Nov 21 2017 David Lutterkort <lutter@watzmann.net> - 1.9.0
 - New upstream version 1.9.0 (RHBZ#1482713)
 - Add -static subpackage (RHBZ#1405600)
diff --git a/gnulib-disable-test-lock.patch b/gnulib-disable-test-lock.patch
deleted file mode 100644
index 43d1b15..0000000
--- a/gnulib-disable-test-lock.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-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) \
diff --git a/sources b/sources
index 943eb3e..da6eeda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (augeas-1.9.0.tar.gz) = 340aed78ac2df455770735b41f3c10a1cbe40f160e236a735d4580edf5b635afeaf7ddadc10e759e9197c4b233e98b3b6b94a3c2f072aa765c104d64371ce171
+SHA512 (augeas-1.10.0.tar.gz) = e0b320f1d64af054d1ea6b97b34d3a0fccdefc92dde452b6ca6fee2d72006fce89ea85ffb8c3a039af265b8b377a8883faa82a2b07090d856439b93a373bb1ff