From 38ca1f7c3fc2faedcab5559663403d587c74bcdd Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 8 Jan 2021 14:47:10 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/python-dns.git#5c204943a3f3822f24868684b5704ed854cd4fb4
---
 .gitignore                      |  1 +
 0001-fix-resolve-chaining.patch | 25 -------------------------
 python-dns.spec                 |  9 +++++----
 sources                         |  2 +-
 4 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 0001-fix-resolve-chaining.patch

diff --git a/.gitignore b/.gitignore
index 3893150..ac5ed14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /v2.0.0.tar.gz
 /dnspython-2.0.0.tar.gz
 /dnspython-2.1.0rc1.tar.gz
+/dnspython-2.1.0.tar.gz
diff --git a/0001-fix-resolve-chaining.patch b/0001-fix-resolve-chaining.patch
deleted file mode 100644
index 63e107d..0000000
--- a/0001-fix-resolve-chaining.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 40af5eb2ede53e7b2e504d8049a17f95b0e45bbf Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Fri, 27 Nov 2020 11:12:39 +0100
-Subject: [PATCH] fix resolve chaining
-
----
- dns/message.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dns/message.py b/dns/message.py
-index 9824e70..7b99431 100644
---- a/dns/message.py
-+++ b/dns/message.py
-@@ -776,6 +776,8 @@ class QueryMessage(Message):
-                     except KeyError:
-                         # Exit the chaining loop
-                         break
-+                else:
-+                    count += 1
-         if count >= MAX_CHAIN:
-             raise ChainTooLong
-         if self.rcode() == dns.rcode.NXDOMAIN and rrset is not None:
--- 
-2.28.0
-
diff --git a/python-dns.spec b/python-dns.spec
index ec0d680..9c96886 100644
--- a/python-dns.spec
+++ b/python-dns.spec
@@ -1,10 +1,10 @@
 %global pypi_name dnspython
 %global py_package_name dns
-%global rctag rc1
+%global rctag %{nil}
 
 Name:           python-%{py_package_name}
 Version:        2.1.0
-Release:        0.2.%{rctag}%{?dist}
+Release:        1%{?dist}
 Summary:        DNS toolkit for Python
 
 # The entire package is licensed with both licenses, see LICENSE file
@@ -12,8 +12,6 @@ License:        ISC and MIT
 URL:            http://www.dnspython.org
 
 Source0:        https://github.com/rthalley/%{pypi_name}/archive/v%{version}%{rctag}/%{pypi_name}-%{version}%{rctag}.tar.gz
-# Fix proposed upstream: https://github.com/rthalley/dnspython/issues/610#issuecomment-734704756
-Patch0:         0001-fix-resolve-chaining.patch
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
@@ -72,6 +70,9 @@ find examples -type f | xargs chmod a-x
 %{python3_sitelib}/%{pypi_name}-*.egg-info
 
 %changelog
+* Fri Jan 08 2021 Lumír Balhar <lbalhar@redhat.com> - 2.1.0-1
+- Update to 2.1.0 final (#1913860)
+
 * Fri Nov 27 2020 Lumír Balhar <lbalhar@redhat.com> - 2.1.0-0.2.rc1
 - Fix upstream issue in resolve chaining
 
diff --git a/sources b/sources
index f5f45d2..b496da8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dnspython-2.1.0rc1.tar.gz) = d1712adb4b859d27439ec10ccc17ba095e3d5fc9e8de797ae02fd88d7f52902145fc99fd526950cd7f36ee0b2fba2a4f831c5ac4f9239bc90574df5110ea54c9
+SHA512 (dnspython-2.1.0.tar.gz) = eb3ab812eb8769b4780055b801e4f89beb1cb3d3e5a4855e583dca83b794eb7fca8fc3ef401eea7c16c34452e801dec5a2c59304f4041a68c7214dea6076435a