From 9851f0f60756ee401aecda791e83679601601333 Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Jul 13 2022 20:49:55 +0000
Subject: Upgrade to 2.3.3 (#2106161)


---

diff --git a/.gitignore b/.gitignore
index 22bdba2..28b4747 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/gpgkey-*.gpg
 /libidn2-*.tar.gz
 /libidn2-*.tar.gz.sig
diff --git a/B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE b/B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE
new file mode 100644
index 0000000..e28c60c
--- /dev/null
+++ b/B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE
@@ -0,0 +1,94 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: B1D2 BD13 75BE CB78 4CF4  F8C4 D73C F638 C53C 06BE
+Comment: Simon Josefsson <simon@josefsson.org>
+
+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
+qQti/j3vHKX6c3yU4FLNCw==
+=KvZq
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/libidn2.spec b/libidn2.spec
index c36c014..8ce0d07 100644
--- a/libidn2.spec
+++ b/libidn2.spec
@@ -1,13 +1,13 @@
 Summary:          Library to support IDNA2008 internationalized domain names
 Name:             libidn2
-Version:          2.3.2
-Release:          4%{?dist}
+Version:          2.3.3
+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-9AA9BDB11BB1B99A21285A330664A76954265E8C.gpg
+Source2:          https://keys.openpgp.org/vks/v1/by-fingerprint/B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE
 
 BuildRequires:    gnupg2
 BuildRequires:    gcc
@@ -44,7 +44,7 @@ The idn2 package contains the idn2 command line tool for testing
 IDNA2008 conversions.
 
 %prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%{!?el7:%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'}
 %setup -q
 
 %build
@@ -86,14 +86,14 @@ fi
 %files -f %{name}.lang
 %license COPYING COPYING.LESSERv3 COPYING.unicode COPYINGv2
 %doc AUTHORS NEWS README.md
-%{_libdir}/%{name}.so.*
+%{_libdir}/%{name}.so.0*
 
 %files devel
 %doc doc/%{name}.html examples
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
-%{_includedir}/*.h
-%{_mandir}/man3/*
+%{_includedir}/idn2.h
+%{_mandir}/man3/idn2_*.3*
 %{_datadir}/gtk-doc/
 
 %files -n idn2
@@ -102,6 +102,9 @@ fi
 %{_infodir}/%{name}.info*
 
 %changelog
+* Wed Jul 13 2022 Robert Scheck <robert@fedoraproject.org> 2.3.3-1
+- Upgrade to 2.3.3 (#2106161)
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index a9addae..c01327c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (gpgkey-9AA9BDB11BB1B99A21285A330664A76954265E8C.gpg) = 83283ba2a977e1c89ddcb1b8c23184e46fdd5871736060c675ae2d4fbfcd583716f3e26ddc72f55d0894c727b41f3c3cf6859301c7a8f8699b5ce1d37c9896de
-SHA512 (libidn2-2.3.2.tar.gz) = 958dbf49a47a84c7627ac182f4cc8ea452696cec3f0d1ff102a6c48e89893e772b2aa81f75da8223dfc6326515cca3ae085268fbf997828de9330c3a351152f1
-SHA512 (libidn2-2.3.2.tar.gz.sig) = 0559b51b37c7937f3e1f8bf9de9b193f137f16b79d6673f85691a4f4a12ec132568e913848a70136f8522118817f7ecaa8432d353a5eff6b99a7be8719421fe0
+SHA512 (libidn2-2.3.3.tar.gz) = 2dd0201b5224b3eb6a5667e53c9a2beb6e6aefefab23060a70f143bb5d447029e8f4200e4e0460a4fab51767f0bdfc9583a0cc757652bee58f5593106dd18274
+SHA512 (libidn2-2.3.3.tar.gz.sig) = bad901350e21ff39f0385685c13b3f366cd77dad59c736547773f9555531bc56022982c3fb6fffd5b82624bdd3ea8bd1806e531f80a06c77e4e46b08f18f08a9