From 30c0744c705927aaa6a098b5b350f9ff37abda5b Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Wed, 19 Jan 2022 14:33:44 +0100
Subject: [PATCH] Update to 2.2.0 and switch to new macros

---
 .gitignore      |  1 +
 python-dns.spec | 62 +++++++++++++++++--------------------------------
 sources         |  2 +-
 3 files changed, 23 insertions(+), 42 deletions(-)

diff --git a/.gitignore b/.gitignore
index ac5ed14..b04fc2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /dnspython-2.0.0.tar.gz
 /dnspython-2.1.0rc1.tar.gz
 /dnspython-2.1.0.tar.gz
+/dnspython-2.2.0.tar.gz
diff --git a/python-dns.spec b/python-dns.spec
index 932daaa..777cee9 100644
--- a/python-dns.spec
+++ b/python-dns.spec
@@ -1,5 +1,4 @@
 %global pypi_name dnspython
-%global py_package_name dns
 %global rctag %{nil}
 
 %if 0%{?rhel}
@@ -12,9 +11,9 @@
 %bcond_without doh
 %endif
 
-Name:           python-%{py_package_name}
-Version:        2.1.0
-Release:        5%{?dist}
+Name:           python-dns
+Version:        2.2.0
+Release:        1%{?dist}
 Summary:        DNS toolkit for Python
 
 # The entire package is licensed with both licenses, see LICENSE file
@@ -25,22 +24,7 @@ Source0:        https://github.com/rthalley/%{pypi_name}/archive/v%{version}%{rc
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-cryptography
-%if %{with trio}
-BuildRequires:  python3-trio
-%endif
-%if %{with curio}
-BuildRequires:  python3-curio
-%endif
-%if %{with trio} || %{with curio}
-BuildRequires:  python3-sniffio
-%endif
-%if %{with doh}
-BuildRequires:  python3-requests
-BuildRequires:  python3-requests-toolbelt
-%endif
-BuildRequires:  python3-idna
+BuildRequires:  pyproject-rpm-macros
 BuildRequires:  python3-pytest
 
 %global _description %{expand:
@@ -55,12 +39,13 @@ manipulation of DNS zones, messages, names, and records.
 }
 
 %description %_description
-%package -n python3-%{py_package_name}
+%package -n python3-dns
 Summary:        %{summary}
 
-%{?python_provide:%python_provide python3-%{py_package_name}}
+%description -n python3-dns %_description
 
-%description -n python3-%{py_package_name} %_description
+%generate_buildrequires
+%pyproject_buildrequires -r %{?with_trio:-x trio} %{?with_curio:-x curio} %{?with_doh:-x doh}
 
 %prep
 %autosetup -p1 -n %{pypi_name}-%{version}%{rctag}
@@ -69,47 +54,42 @@ Summary:        %{summary}
 find examples -type f | xargs chmod a-x
 
 %build
-%py3_build
+%pyproject_wheel
 
 %install
-%py3_install
+%pyproject_install
+%pyproject_save_files dns
 
 %check
-# testCanonicalNameDangling is failing with
-#    AssertionError: <DNS name dangling-cname.dnspython.org.> != <DNS name dangling-target.dnspython.org.>
-pytest -k "not testCanonicalNameDangling"
+%pytest
 
-%files -n python3-%{py_package_name}
+%files -n python3-dns -f %{pyproject_files}
 %license LICENSE
 %doc README.md examples
-%{?python_extras_subpkg:
 %pycached %exclude %{python3_sitelib}/dns/_trio_backend.py
 %pycached %exclude %{python3_sitelib}/dns/_curio_backend.py
-}
-%{python3_sitelib}/%{py_package_name}
-%{python3_sitelib}/%{pypi_name}-*.egg-info
 
-%{?python_extras_subpkg:
-%python_extras_subpkg -n python3-dns -i %{python3_sitelib}/*.egg-info dnssec idna
+%pyproject_extras_subpkg -n python3-dns dnssec idna
 
 %if %{with doh}
-%python_extras_subpkg -n python3-dns -i %{python3_sitelib}/*.egg-info doh
+%pyproject_extras_subpkg -n python3-dns doh
 %endif
 
 %if %{with trio}
-%python_extras_subpkg -n python3-dns -i %{python3_sitelib}/*.egg-info trio
+%pyproject_extras_subpkg -n python3-dns trio
 %pycached %{python3_sitelib}/dns/_trio_backend.py
 %endif
 
 %if %{with curio}
-%python_extras_subpkg -n python3-dns -i %{python3_sitelib}/*.egg-info curio
+%pyproject_extras_subpkg -n python3-dns curio
 %pycached %{python3_sitelib}/dns/_curio_backend.py
 %endif
 
-# end of python_extras_subpkg
-}
-
 %changelog
+* Wed Jan 19 2022 Lumír Balhar <lbalhar@redhat.com> - 2.2.0-1
+- Update to 2.2.0
+Resolves: rhbz#2034677
+
 * Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-5
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index b496da8..3ccc345 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dnspython-2.1.0.tar.gz) = eb3ab812eb8769b4780055b801e4f89beb1cb3d3e5a4855e583dca83b794eb7fca8fc3ef401eea7c16c34452e801dec5a2c59304f4041a68c7214dea6076435a
+SHA512 (dnspython-2.2.0.tar.gz) = 0a93bde1ca1081c92b9fb5a02644c4920813f2d0dbe4de1dae736262d53afe41327f3fdd38a10f74ec78f54dd7c7570e37d0adb2b21ab18f9b5cc099fcc6bb85