From d539fb737755cb2a298da3e3dde5832d070356ee754535e146b26f9dd2952850 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Fri, 24 Feb 2023 11:33:24 +0000
Subject: [PATCH] - Don't upper limit version of charset_normalized at runtime,
 too.   * Added change to patch: requests-no-hardcoded-version.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-requests?expand=0&rev=172
---
 python-requests.changes             |  6 ++++++
 python-requests.spec                |  6 ++----
 requests-no-hardcoded-version.patch | 23 +++++++++++++++++++----
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/python-requests.changes b/python-requests.changes
index c5d0eb5..c845811 100644
--- a/python-requests.changes
+++ b/python-requests.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 16 17:03:23 UTC 2023 - David Anes <david.anes@suse.com>
+
+- Don't upper limit version of charset_normalized at runtime, too.
+  * Added change to patch: requests-no-hardcoded-version.patch
+
 -------------------------------------------------------------------
 Sat Jan 21 10:01:11 UTC 2023 - Dirk Müller <dmueller@suse.com>
 
diff --git a/python-requests.spec b/python-requests.spec
index 415313f..36737ad 100644
--- a/python-requests.spec
+++ b/python-requests.spec
@@ -33,9 +33,8 @@ License:        Apache-2.0
 Group:          Development/Languages/Python
 URL:            https://docs.python-requests.org/
 Source:         https://files.pythonhosted.org/packages/source/r/requests/requests-%{version}.tar.gz
-# PATCH-FIX-SUSE: do not hardcode versions in setup.py/requirements
+# PATCH-FIX-UPSTREAM: Allow charset normalizer >=2 and <4, and don't strict require httpbin===1.0.0
 Patch0:         requests-no-hardcoded-version.patch
-# PATCH-FIX-UPSTREAN: Allow charset normalizer >=2 and <4
 BuildRequires:  %{python_module base >= 3.7}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
@@ -91,8 +90,7 @@ Features of Requests:
    + URL + HTTP Auth Registry.
 
 %prep
-%setup -q -n requests-%{version}
-%autopatch -p1
+%autosetup -p1 -n requests-%{version}
 
 # drop shebang from certs.py
 sed -i '1s/^#!.*$//' requests/certs.py
diff --git a/requests-no-hardcoded-version.patch b/requests-no-hardcoded-version.patch
index e3e2075..76cf772 100644
--- a/requests-no-hardcoded-version.patch
+++ b/requests-no-hardcoded-version.patch
@@ -1,7 +1,22 @@
-diff -ur requests-2.28.1.orig/setup.py requests-2.28.1/setup.py
---- requests-2.28.1.orig/setup.py	2022-06-29 17:09:45.000000000 +0200
-+++ requests-2.28.1/setup.py	2022-06-29 21:15:48.428104387 +0200
-@@ -65,7 +65,7 @@
+---
+ requirements-dev.txt |    2 +-
+ setup.py             |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/requirements-dev.txt
++++ b/requirements-dev.txt
+@@ -1,7 +1,7 @@
+ -e .[socks]
+ pytest>=2.8.0,<=6.2.5
+ pytest-cov
+-pytest-httpbin==1.0.0
++pytest-httpbin>=1.0.0
+ pytest-mock==2.0.0
+ httpbin==0.7.0
+ trustme
+--- a/setup.py
++++ b/setup.py
+@@ -65,7 +65,7 @@ requires = [
      "certifi>=2017.4.17",
  ]
  test_requirements = [