From c003e5d5a1d737471c8c2c6488d5a428dbda7798dbd857028e4f72549dccb125 Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.com>
Date: Sat, 6 Feb 2021 07:11:04 +0000
Subject: [PATCH] add 0001-lift-requests-version-requirements.patch

OBS-URL: https://build.opensuse.org/package/show/devel:tools/b4?expand=0&rev=38
---
 0001-lift-requests-version-requirement.patch  | 28 -----------------
 0001-lift-requests-version-requirements.patch | 31 +++++++++++++++++++
 b4.changes                                    |  7 +++++
 b4.spec                                       |  2 +-
 4 files changed, 39 insertions(+), 29 deletions(-)
 delete mode 100644 0001-lift-requests-version-requirement.patch
 create mode 100644 0001-lift-requests-version-requirements.patch

diff --git a/0001-lift-requests-version-requirement.patch b/0001-lift-requests-version-requirement.patch
deleted file mode 100644
index 880f708..0000000
--- a/0001-lift-requests-version-requirement.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7ccf601c7bab3d1363f73e1a688f36ee291b8473 Mon Sep 17 00:00:00 2001
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Fri, 18 Dec 2020 09:57:54 +0100
-Subject: [PATCH] lift "requests" version requirement
-Patch-upstream: it will get fixed eventually
-
-We have 2.25 in TW.
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 358e6a7a..f6ed6745 100644
---- a/setup.py
-+++ b/setup.py
-@@ -41,7 +41,7 @@ setup(
-     data_files = [('share/man/man5', ['man/b4.5'])],
-     keywords=['git', 'lore.kernel.org', 'patches'],
-     install_requires=[
--        'requests~=2.24.0',
-+        'requests>=2.24.0',
-         'dkimpy~=1.0.5',
-         'dnspython~=2.0.0',
-     ],
--- 
-2.26.2
-
diff --git a/0001-lift-requests-version-requirements.patch b/0001-lift-requests-version-requirements.patch
new file mode 100644
index 0000000..9494b59
--- /dev/null
+++ b/0001-lift-requests-version-requirements.patch
@@ -0,0 +1,31 @@
+From be92fafe2b4d80e1ef09c9f594f1f68920ee6523 Mon Sep 17 00:00:00 2001
+From: Jiri Slaby <jslaby@suse.cz>
+Date: Fri, 18 Dec 2020 09:57:54 +0100
+Subject: [PATCH] lift "requests" version requirements
+Patch-upstream: it will get fixed eventually
+
+We have requests-2.25, dnspython-2.0.1 in TW...
+---
+ setup.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 358e6a7a..952ad861 100644
+--- a/setup.py
++++ b/setup.py
+@@ -41,9 +41,9 @@ setup(
+     data_files = [('share/man/man5', ['man/b4.5'])],
+     keywords=['git', 'lore.kernel.org', 'patches'],
+     install_requires=[
+-        'requests~=2.24.0',
+-        'dkimpy~=1.0.5',
+-        'dnspython~=2.0.0',
++        'requests>=2.24.0',
++        'dkimpy>=1.0.5',
++        'dnspython>=2.0.0',
+     ],
+     python_requires='>=3.6',
+     entry_points={
+-- 
+2.26.2
+
diff --git a/b4.changes b/b4.changes
index cda83b2..6bae5d7 100644
--- a/b4.changes
+++ b/b4.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Feb  6 07:10:19 UTC 2021 - Jiri Slaby <jslaby@suse.cz>
+
+- fix for newer dnspython
+  * add 0001-lift-requests-version-requirements.patch
+  * remove 0001-lift-requests-version-requirement.patch
+
 -------------------------------------------------------------------
 Fri Jan 22 06:09:14 UTC 2021 - jslaby@suse.cz
 
diff --git a/b4.spec b/b4.spec
index fa1a70b..334e91a 100644
--- a/b4.spec
+++ b/b4.spec
@@ -25,7 +25,7 @@ License:        GPL-2.0-or-later
 Group:          Development/Tools/Other
 URL:            https://git.kernel.org/pub/scm/utils/b4/b4.git
 Source0:        %{name}-%{version}.tar.xz
-Patch0:         0001-lift-requests-version-requirement.patch
+Patch0:         0001-lift-requests-version-requirements.patch
 BuildArch:      noarch
 # for checks
 BuildRequires:  git-core