From ea52e0623e7a0ebdc83939f8afcd84303ff6fed438475a5d62bf0579f311d879 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Wed, 19 Jun 2019 22:47:46 +0000
Subject: [PATCH] Revert to r69

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

diff --git a/python-urllib3.changes b/python-urllib3.changes
index d8fa20f..da06827 100644
--- a/python-urllib3.changes
+++ b/python-urllib3.changes
@@ -1,9 +1,3 @@
--------------------------------------------------------------------
-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 93af018..8cc5ba3 100644
--- a/python-urllib3.spec
+++ b/python-urllib3.spec
@@ -151,13 +151,6 @@ 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'