From e397a5c391d6df14b1b263ae87543984b6f9070ad1a9deeb07e8508795dbc6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 6 May 2019 11:21:12 +0000
Subject: [PATCH] - Update to 1.25.2:   * Change is_ipaddress to not detect
 IPvFuture addresses. (Pull #1583)   * Change parse_url to percent-encode
 invalid characters within the path, query, and target components. (Pull
 #1586)   * Add support for Google's Brotli package. (Pull #1572, Pull #1579) 
  * Upgrade bundled rfc3986 to v1.3.1 (Pull #1578) - Require all the deps from
 the secure list rather than Recommend.   This makes the check to be run
 always and ensure the urls are   "secure". - Remove ndg-httpsclient as it is
 not needed since 2015

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3?expand=0&rev=63
---
 python-urllib3.changes | 13 +++++++++++++
 python-urllib3.spec    | 31 +++++++++++++------------------
 urllib3-1.25.2.tar.gz  |  3 +++
 urllib3-1.25.tar.gz    |  3 ---
 4 files changed, 29 insertions(+), 21 deletions(-)
 create mode 100644 urllib3-1.25.2.tar.gz
 delete mode 100644 urllib3-1.25.tar.gz

diff --git a/python-urllib3.changes b/python-urllib3.changes
index d8f30e0..98189c6 100644
--- a/python-urllib3.changes
+++ b/python-urllib3.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon May  6 11:18:36 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Update to 1.25.2:
+  * Change is_ipaddress to not detect IPvFuture addresses. (Pull #1583)
+  * Change parse_url to percent-encode invalid characters within the path, query, and target components. (Pull #1586)
+  * Add support for Google's Brotli package. (Pull #1572, Pull #1579)
+  * Upgrade bundled rfc3986 to v1.3.1 (Pull #1578)
+- Require all the deps from the secure list rather than Recommend.
+  This makes the check to be run always and ensure the urls are
+  "secure".
+- Remove ndg-httpsclient as it is not needed since 2015
+
 -------------------------------------------------------------------
 Tue Apr 23 10:27:36 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-urllib3.spec b/python-urllib3.spec
index 272f85d..195e883 100644
--- a/python-urllib3.spec
+++ b/python-urllib3.spec
@@ -18,20 +18,16 @@
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define oldpython python
-
 %global flavor @BUILD_FLAVOR@%{nil}
 %if "%{flavor}" == "test"
-%define test 1
+%define psuffix -test
 %bcond_without test
 %else
+%define psuffix %{nil}
 %bcond_with test
 %endif
-%if %{with test}
-Name:           python-urllib3-%{flavor}
-%else
-Name:           python-urllib3
-%endif
-Version:        1.25
+Name:           python-urllib3%{psuffix}
+Version:        1.25.2
 Release:        0
 Summary:        HTTP library with thread-safe connection pooling, file post, and more
 License:        MIT
@@ -43,11 +39,20 @@ Source:         https://files.pythonhosted.org/packages/source/u/urllib3/urllib3
 Patch2:         urllib3-ssl-default-context.patch
 # PATCH-FIX-UPSTREAM python-urllib3-recent-date.patch gh#shazow/urllib3#1303, boo#1074247 dimstar@opensuse.org -- Fix test suite, use correct date
 Patch4:         python-urllib3-recent-date.patch
+# for SSL module on older distros
+BuildRequires:  %{oldpython}
 BuildRequires:  %{python_module PySocks}
 BuildRequires:  %{python_module psutil}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
+BuildRequires:  python2-ipaddress
+#!BuildIgnore:  python-requests
+Requires:       ca-certificates-mozilla
+Requires:       python-cryptography
+Requires:       python-idna
+Requires:       python-pyOpenSSL
+BuildArch:      noarch
 %if %{with test}
 BuildRequires:  %{python_module brotlipy}
 BuildRequires:  %{python_module idna}
@@ -56,19 +61,9 @@ BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module tornado >= 4.2.1}
 BuildRequires:  %{python_module urllib3 >= %{version}}
 %endif
-#!BuildIgnore:  python-requests
-BuildArch:      noarch
 %if 0%{?suse_version} >= 1000 || 0%{?fedora_version} >= 24
-Recommends:     ca-certificates-mozilla
-Recommends:     python-cryptography
-Recommends:     python-idna
-Recommends:     python-ndg-httpsclient
-Recommends:     python-pyOpenSSL
 Recommends:     python-brotlipy
 %endif
-# for SSL module on older distros
-BuildRequires:  %{oldpython}
-BuildRequires:  python2-ipaddress
 %ifpython2
 Requires:       python-ipaddress
 %endif
diff --git a/urllib3-1.25.2.tar.gz b/urllib3-1.25.2.tar.gz
new file mode 100644
index 0000000..5f3512f
--- /dev/null
+++ b/urllib3-1.25.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a53063d8b9210a7bdec15e7b272776b9d42b2fd6816401a0d43006ad2f9902db
+size 261479
diff --git a/urllib3-1.25.tar.gz b/urllib3-1.25.tar.gz
deleted file mode 100644
index 3a15bce..0000000
--- a/urllib3-1.25.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f03eeb431c77b88cf8747d47e94233a91d0e0fdae1cf09e0b21405a885700266
-size 409895