From 3b2b3a7c3bf17f90cf7b33af5e5b54a0e3757313 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 12 Jan 2022 17:36:32 +0000
Subject: [PATCH] New upstream version 1.13.0

---
 augeas.spec | 31 ++++++++++++++-----------------
 sources     |  2 +-
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/augeas.spec b/augeas.spec
index 7b9a5ba..03787a8 100644
--- a/augeas.spec
+++ b/augeas.spec
@@ -1,24 +1,18 @@
-# Upstream releases have been very infrequent but there is still
-# development going on, so for now (July 2021) package up the latest
-# git version.
-%global commit 18558bbeaeee7f6bed5dba64592aa8b23fa521ee
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 Name:           augeas
-Version:        1.12.1
-Release:        0.2.git%{shortcommit}%{?dist}
+Version:        1.13.0
+Release:        1%{?dist}
 Summary:        A library for changing configuration files
 
 License:        LGPLv2+
 URL:            http://augeas.net/
-# Upstream tarballs.
-#Source0:        http://download.augeas.net/%%{name}-%%{version}.tar.gz
-# Upstream git repo.
-#Source0:        https://github.com/hercules-team/augeas/archive/%%{commit}/%%{name}-%%{shortcommit}.tar.gz
-# However because of gnulib stupidity we can't use either with
-# pre-releases.  Instead I had to build a tarball from the prerelease
-# commit:
-Source0:        augeas-18558bb.tar.gz
+
+# The upstream release tarballs on github don't work, see:
+# https://github.com/hercules-team/augeas/pull/744
+# The website release tarballs were not created for 1.13:
+# http://download.augeas.net/
+#Source0:        https://github.com/hercules-team/augeas/archive/refs/tags/release-%{version}.tar.gz
+# So I had to create a tarball myself using make dist.
+Source0:        %{name}-%{version}.tar.gz
 
 Provides:       bundled(gnulib)
 
@@ -72,7 +66,7 @@ static builds using %{name}.
 
 
 %prep
-%autosetup -p1 -n %{name}-1.12.0
+%autosetup -p1
 
 %build
 %configure \
@@ -136,6 +130,9 @@ rm -f $RPM_BUILD_ROOT/usr/bin/dump
 %{_libdir}/libfa.a
 
 %changelog
+* Wed Jan 12 2022 Richard W.M. Jones <rjones@redhat.com> - 1.13.0-1
+- New upstream version 1.13.0
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-0.2.git18558bb
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index dad857e..a27eb29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (augeas-18558bb.tar.gz) = bd3a51a2f350664565a32deaeec43f037c5a512ba16189571da9a0c8762156cc2481e59bd3fac824444b831473e78a667216094963be3ce2d3aa4c707ccfb437
+SHA512 (augeas-1.13.0.tar.gz) = e66327cfbe335fa83a8442ec1bd72f258e8e4d4a42d234ee5077ac60741e2c26bc67db39a6cc920a19e71c27247395bd145ed5288545170cd463d4cf22b2c184