From 3095c8247cd7dac91c502718e9d8a45432d498bebc09ab8acb9e25478e8a3e90 Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Wed, 7 Jun 2023 15:44:38 +0000
Subject: [PATCH] - Fix the application of the
 python-2.7.17-switch-off-failing-SSL-tests.patch.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=369
---
 python-2.7.17-switch-off-failing-SSL-tests.patch | 6 +++++-
 python-base.changes                              | 5 +++++
 python-base.spec                                 | 4 +++-
 python-doc.changes                               | 5 +++++
 python-doc.spec                                  | 4 +++-
 python.changes                                   | 5 +++++
 python.spec                                      | 4 +++-
 7 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/python-2.7.17-switch-off-failing-SSL-tests.patch b/python-2.7.17-switch-off-failing-SSL-tests.patch
index 80b5588..af3bb8b 100644
--- a/python-2.7.17-switch-off-failing-SSL-tests.patch
+++ b/python-2.7.17-switch-off-failing-SSL-tests.patch
@@ -1,3 +1,7 @@
+---
+ Lib/test/test_ssl.py |    5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
 --- a/Lib/test/test_ssl.py
 +++ b/Lib/test/test_ssl.py
 @@ -152,9 +152,7 @@ def skip_if_broken_ubuntu_ssl(func):
@@ -15,7 +19,7 @@
          self.assertEqual(ctx.verify_mode, ssl.CERT_NONE)
          self._assert_context_options(ctx)
  
-+    @skip_if_broken_ubuntu_ssl
++    @unittest.skip("Test fails on SLE-12")
      def test__https_verify_certificates(self):
          # Unit test to check the contect factory mapping
          # The factories themselves are tested above
diff --git a/python-base.changes b/python-base.changes
index 12c4cd5..67b3814 100644
--- a/python-base.changes
+++ b/python-base.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun  7 15:37:43 UTC 2023 - Matej Cepl <mcepl@suse.com>
+
+- Fix the application of the python-2.7.17-switch-off-failing-SSL-tests.patch.
+
 -------------------------------------------------------------------
 Tue May 30 10:43:13 UTC 2023 - Andreas Schwab <schwab@suse.de>
 
diff --git a/python-base.spec b/python-base.spec
index 49f3c89..27fdaeb 100644
--- a/python-base.spec
+++ b/python-base.spec
@@ -270,7 +270,9 @@ other applications.
 %if %{suse_version} >= 1500 || (0%{?sle_version} && 0%{?sle_version} >= 120400)
 %patch47 -p1
 %patch48 -p1
-%else
+%endif
+# Combination of SLE-12 and new OpenSSL makes things weird
+%if %{suse_version} == 1315 && 0%{?sle_version} >= 120400
 %patch57 -p1
 %endif
 %patch49 -p1
diff --git a/python-doc.changes b/python-doc.changes
index 12c4cd5..67b3814 100644
--- a/python-doc.changes
+++ b/python-doc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun  7 15:37:43 UTC 2023 - Matej Cepl <mcepl@suse.com>
+
+- Fix the application of the python-2.7.17-switch-off-failing-SSL-tests.patch.
+
 -------------------------------------------------------------------
 Tue May 30 10:43:13 UTC 2023 - Andreas Schwab <schwab@suse.de>
 
diff --git a/python-doc.spec b/python-doc.spec
index 496b7aa..8210f05 100644
--- a/python-doc.spec
+++ b/python-doc.spec
@@ -204,7 +204,9 @@ Python, and Macintosh Module Reference in PDF format.
 %if %{suse_version} >= 1500 || (0%{?sle_version} && 0%{?sle_version} >= 120400)
 %patch47 -p1
 %patch48 -p1
-%else
+%endif
+# Combination of SLE-12 and new OpenSSL makes things weird
+%if %{suse_version} == 1315 && 0%{?sle_version} >= 120400
 %patch57 -p1
 %endif
 %patch49 -p1
diff --git a/python.changes b/python.changes
index 12c4cd5..67b3814 100644
--- a/python.changes
+++ b/python.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jun  7 15:37:43 UTC 2023 - Matej Cepl <mcepl@suse.com>
+
+- Fix the application of the python-2.7.17-switch-off-failing-SSL-tests.patch.
+
 -------------------------------------------------------------------
 Tue May 30 10:43:13 UTC 2023 - Andreas Schwab <schwab@suse.de>
 
diff --git a/python.spec b/python.spec
index 8123aac..1604d26 100644
--- a/python.spec
+++ b/python.spec
@@ -324,7 +324,9 @@ that rely on earlier non-verification behavior.
 %if %{suse_version} >= 1500 || (0%{?sle_version} && 0%{?sle_version} >= 120400)
 %patch47 -p1
 %patch48 -p1
-%else
+%endif
+# Combination of SLE-12 and new OpenSSL makes things weird
+%if %{suse_version} == 1315 && 0%{?sle_version} >= 120400
 %patch57 -p1
 %endif
 %patch49 -p1