diff --git a/backport-fix-missing-version-in-setup.cfg.patch b/backport-fix-missing-version-in-setup.cfg.patch new file mode 100644 index 0000000000000000000000000000000000000000..e755100ab0298bfbd70b2fb687cfe0fb142a483e --- /dev/null +++ b/backport-fix-missing-version-in-setup.cfg.patch @@ -0,0 +1,21 @@ +From a4e88cfb2dcb98c589bbc1eb7452c773faf46398 Mon Sep 17 00:00:00 2001 +From: eaglegai +Date: Thu, 27 Oct 2022 23:07:17 +0800 +Subject: [PATCH] fix missing version in setup.cfg + +Signed-off-by: eaglegai +--- + setup.cfg | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/setup.cfg b/setup.cfg +index a32ff8ce..cc7e3b0d 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -1,5 +1,6 @@ + [metadata] + name = dnspython ++version = 2.2.1 + author = Bob Halley + author_email = halley@dnspython.org + license = ISC diff --git a/dnspython-2.1.0.tar.gz b/dnspython-2.1.0.tar.gz deleted file mode 100644 index 3991c894d1d1c0fb2c6d65b3919bbda808d74a20..0000000000000000000000000000000000000000 Binary files a/dnspython-2.1.0.tar.gz and /dev/null differ diff --git a/dnspython-2.2.1.tar.gz b/dnspython-2.2.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..a5fd64892dea774b206dac21d572dd4c6e87befb Binary files /dev/null and b/dnspython-2.2.1.tar.gz differ diff --git a/fix-failed-tests.patch b/fix-failed-tests.patch index 7ea6083b677dd100bc499c2ff4b759c7d4b2fb7c..ba39c90b7f33787db89b335706244b12921e1a0f 100644 --- a/fix-failed-tests.patch +++ b/fix-failed-tests.patch @@ -55,8 +55,8 @@ diff -ruNa dnspython-2.1.0-org/tests/test_async.py dnspython-2.1.0/tests/test_as +_network_available = False - # Probe for IPv4 and IPv6 - query_addresses = [] + # Look for systemd-resolved, as it does dangling CNAME responses incorrectly. + # diff -ruNa dnspython-2.1.0-org/tests/test_query.py dnspython-2.1.0/tests/test_query.py --- dnspython-2.1.0-org/tests/test_query.py 2021-07-07 10:04:01.861405149 +0800 +++ dnspython-2.1.0/tests/test_query.py 2021-07-07 10:05:44.431553273 +0800 diff --git a/python-dns.spec b/python-dns.spec index 24ae38cdcc0653a88ab6fb8897d4fb29a4285354..b999bee5b215b13bcaad04235f74c4da01a8e009 100644 --- a/python-dns.spec +++ b/python-dns.spec @@ -13,17 +13,18 @@ messages, names, and records. Name: python-dns Summary: %{sum} -Version: 2.1.0 -Release: 2 +Version: 2.2.1 +Release: 1 License: ISC and MIT URL: http://www.dnspython.org/ Source0: https://github.com/rthalley/dnspython/archive/v%{version}/dnspython-%{version}.tar.gz Patch0: fix-failed-tests.patch +Patch1: backport-fix-missing-version-in-setup.cfg.patch BuildArch: noarch -BuildRequires: python3-devel python3-setuptools python3-pycryptodome python3-ecdsa +BuildRequires: python3-devel python3-setuptools python3-cryptography BuildRequires: python3-pytest %description @@ -32,7 +33,7 @@ BuildRequires: python3-pytest %package -n python3-dns Summary: %{sum} %{?python_provide:%python_provide python3-dns} -Requires: python3-pycryptodome python3-ecdsa +Requires: python3-cryptography %description -n python3-dns %{_description} @@ -44,6 +45,7 @@ Requires: python3-pycryptodome python3-ecdsa find examples -type f | xargs chmod a-x %build +sed -i 's/setup_requires = setuptools>=44; wheel; setuptools_scm\[toml\]>=3.4.3/setup_requires = setuptools>=44;/' setup.cfg %py3_build %install @@ -61,6 +63,9 @@ pytest %doc examples %changelog +* Thu Oct 27 2022 gaihuiying - 2.2.1-1 +- update to 2.2.1 + * Sat Jan 08 2022 quanhongfei - 2.1.0-2 - fix tests failed