From 2d2e42a825d5750b90acc68a0ede7a9b22e442ae Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Thu, 13 May 2021 14:07:57 +0200
Subject: [PATCH] Upgrade to 2.3.1 (#1960005)

---
 libidn2.spec | 11 ++++++++---
 sources      |  6 +++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/libidn2.spec b/libidn2.spec
index 869b8b9..2b38eef 100644
--- a/libidn2.spec
+++ b/libidn2.spec
@@ -1,13 +1,13 @@
 Summary:          Library to support IDNA2008 internationalized domain names
 Name:             libidn2
-Version:          2.3.0
-Release:          5%{?dist}
+Version:          2.3.1
+Release:          1%{?dist}
 License:          (GPLv2+ or LGPLv3+) and GPLv3+
 URL:              https://www.gnu.org/software/libidn/#libidn2
 
 Source0:          https://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz
 Source1:          https://ftp.gnu.org/gnu/libidn/%{name}-%{version}.tar.gz.sig
-Source2:          gpgkey-1CB27DBC98614B2D5841646D08302DB6A2670428.gpg
+Source2:          gpgkey-9AA9BDB11BB1B99A21285A330664A76954265E8C.gpg
 Patch0:           libidn2-2.0.0-rpath.patch
 
 BuildRequires:    gnupg2
@@ -50,7 +50,9 @@ IDNA2008 conversions.
 %patch0 -p1 -b .rpath
 touch -c -r configure.rpath configure
 touch -c -r m4/libtool.m4.rpath m4/libtool.m4
+%if 0%{?fedora} || 0%{?rhel} > 8
 touch -c -r m4/libtool.m4.rpath aclocal.m4
+%endif
 
 %build
 %configure --disable-static
@@ -105,6 +107,9 @@ fi
 %{_infodir}/%{name}.info*
 
 %changelog
+* Wed May 12 2021 Robert Scheck <robert@fedoraproject.org> 2.3.1-1
+- Upgrade to 2.3.1 (#1960005)
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index cafae2b..3881564 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (gpgkey-1CB27DBC98614B2D5841646D08302DB6A2670428.gpg) = 2db1095d927e2c4cef6819cfe9a263e7488b704bfe3a9a7a708c997391370aa7c6c0c25671e6594620e38c303b8b67ec50a1fc8838af297df054d1ed93f2e68a
-SHA512 (libidn2-2.3.0.tar.gz) = a2bf6d2249948bce14fbbc802f8af1c9b427fc9bf64203a2f3d7239d8e6061d0a8e7970a23e8e5889110a654a321e0504c7a6d049bb501e7f6a23d42b50b6187
-SHA512 (libidn2-2.3.0.tar.gz.sig) = 5ac8623411e5acbbdbd6e1163b5763d0f99ed91fb6b0705264e44c2d9f98e230c025931cf40996126ff6a56396b9e6cd527e5caaa02978be3becff9fb4ad1a81
+SHA512 (gpgkey-9AA9BDB11BB1B99A21285A330664A76954265E8C.gpg) = 83283ba2a977e1c89ddcb1b8c23184e46fdd5871736060c675ae2d4fbfcd583716f3e26ddc72f55d0894c727b41f3c3cf6859301c7a8f8699b5ce1d37c9896de
+SHA512 (libidn2-2.3.1.tar.gz) = 4d77a4a79e08a05e46fc14827f987b9e7645ebf5d0c0869eb96f9902c2f6b73ea69fd6f9f97b80a9f07cce84f7aa299834df91485d4e7c16500d31a4b9865fe4
+SHA512 (libidn2-2.3.1.tar.gz.sig) = 2db4bb3a11562634276664fb857306271c6ebc96cf5e90b39b404c3fe47190ec65ce3866cebcfa0c1216d29d7aed8c7907b869e602a722db1cf8f6ab94da9c78