From 2942de9f591820b85d5161d36e1e709695deea788f26db3ac16c6f5855291878 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Wed, 19 Jun 2019 22:40:14 +0000
Subject: [PATCH] Accepting request 710979 from
 home:mcepl:branches:devel:languages:python

Fix for bsc#1138715

OBS-URL: https://build.opensuse.org/request/show/710979
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3?expand=0&rev=70
---
 python-urllib3.changes | 6 ++++++
 python-urllib3.spec    | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/python-urllib3.changes b/python-urllib3.changes
index da06827..d8fa20f 100644
--- a/python-urllib3.changes
+++ b/python-urllib3.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 20 00:30:19 CEST 2019 - Matej Cepl <mcepl@suse.com>
+
+- bsc#1138715: Add precaution when on upgrade there is
+  conflicting ssl_match_hostname directory.
+
 -------------------------------------------------------------------
 Fri Jun  7 11:40:05 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/python-urllib3.spec b/python-urllib3.spec
index 8cc5ba3..93af018 100644
--- a/python-urllib3.spec
+++ b/python-urllib3.spec
@@ -151,6 +151,13 @@ ln -s %{python3_sitelib}/rfc3986/ \
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
 %endif
 
+# There is a possible conflict with older version of the package
+%pre
+CONFLICTED="%{python3_sitelib}/urllib3/packages/ssl_match_hostname"
+if [ "$1" -gt 1 ] && [ -d "$CONFLICTED"  ] ; then 
+    rm -rf $CONFLICTED
+fi
+
 %check
 %if %{with test}
 skiplist='not test_select_interrupt_exception and not test_selector_error and not timeout and not test_request_host_header_ignores_fqdn_dot and not test_dotted_fqdn and not TestImportWithoutSSL'