Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python36 for openSUSE:Factory
checked in at 2021-12-18 20:29:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python36 (Old)
and /work/SRC/openSUSE:Factory/.python36.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python36"
Sat Dec 18 20:29:50 2021 rev:26 rq:940937 version:3.6.15
Changes:
--------
--- /work/SRC/openSUSE:Factory/python36/python36.changes 2021-12-12
21:27:11.092326450 +0100
+++ /work/SRC/openSUSE:Factory/.python36.new.2520/python36.changes
2021-12-18 20:30:19.438245140 +0100
@@ -1,0 +2,9 @@
+Thu Dec 16 00:46:09 UTC 2021 - Matej Cepl <mc...@suse.com>
+
+- Don't use appstream-glib on SLE-12.
+- Use Python 2-based Sphinx on SLE-12.
+- No documentation on SLE-12.
+- Add skip_SSL_tests.patch skipping tests because of patched
+ OpenSSL (bpo#9425).
+
+-------------------------------------------------------------------
@@ -419 +428,2 @@
-- Remove merged patch CVE-2020-8492-urllib-ReDoS.patch
+- Remove merged patch CVE-2020-8492-urllib-ReDoS.patch and
+ CRLF_injection_via_host_part.patch.
New:
----
skip_SSL_tests.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python36.spec ++++++
--- /var/tmp/diff_new_pack.O2WQjZ/_old 2021-12-18 20:30:21.322246187 +0100
+++ /var/tmp/diff_new_pack.O2WQjZ/_new 2021-12-18 20:30:21.326246189 +0100
@@ -19,7 +19,11 @@
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "doc"
%define psuffix -documentation
+%if 0%{?suse_version} >= 1500
%bcond_without doc
+%else
+%bcond_with doc
+%endif
%bcond_with base
%bcond_with general
%endif
@@ -34,6 +38,11 @@
%bcond_with doc
%bcond_with base
%bcond_without general
+%if 0%{?suse_version} >= 1500
+%bcond_without appstream
+%else
+%bcond_with appstream
+%endif
%endif
%define _version %(c=%{version}; echo ${c/[a-z]*/})
%define tar_suffix %(c=%{_version}; echo ${c#%{_version}})
@@ -152,6 +161,9 @@
# PATCH-FIX-OPENSUSE aarch64-prolong-timeout.patch bsc#1149121 mc...@suse.com
# Our buildbots are apparently too busy on aarch64 to make time right
Patch30: aarch64-prolong-timeout.patch
+# PATCH-FIX-OPENSUSE skip_SSL_tests.patch bpo#9425 mc...@suse.com
+# Skip broken SSL tests (switch on skipping Ubuntu tests)
+Patch31: skip_SSL_tests.patch
# PATCH-FIX-UPSTREAM bpo-36576-skip_tests_for_OpenSSL-111.patch bsc#1149792
mc...@suse.com
# Skip tests failing with OpenSSL 1.1.1
Patch32: bpo-36576-skip_tests_for_OpenSSL-111.patch
@@ -199,7 +211,7 @@
BuildRequires: pkgconfig(libtirpc)
%endif
%if %{with doc}
-%if 0%{?sle_version} && 0%{?sle_version} <= 150300
+%if 0%{?suse_version} >= 1500 && 0%{?sle_version} <= 150300
# Here we just run sphinx and we can use generic one, we don't need
# the flavor variant
BuildRequires: python3-Sphinx
@@ -211,7 +223,9 @@
%endif
%if %{with general}
# required for idle3 (.desktop and .appdata.xml files)
+%if %{with appstream}
BuildRequires: appstream-glib
+%endif
BuildRequires: gcc-c++
BuildRequires: gdbm-devel
BuildRequires: gettext
@@ -442,7 +456,11 @@
%patch24 -p1
%patch29 -p1
%patch30 -p1
+%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 120400
+%patch31 -p1
+%else
%patch32 -p1
+%endif
%patch33 -p1
%patch35 -p1
%patch36 -p1
@@ -686,11 +704,13 @@
install -m 644 -D -t %{buildroot}%{_datadir}/applications
idle%{python_version}.desktop
%suse_update_desktop_file idle%{python_version}
+%if %{with appstream}
cp %{SOURCE13} idle%{python_version}.appdata.xml
sed -i -e 's:idle3.desktop:idle%{python_version}.desktop:g'
idle%{python_version}.appdata.xml
mkdir -p %{buildroot}%{_datadir}/metainfo
install -m 644 -D -t %{buildroot}%{_datadir}/metainfo
idle%{python_version}.appdata.xml
appstream-util validate-relax --nonet
%{buildroot}%{_datadir}/metainfo/idle%{python_version}.appdata.xml
+%endif
%fdupes %{buildroot}/%{_libdir}/python%{python_version}
%endif
@@ -833,8 +853,10 @@
%doc Lib/idlelib/ChangeLog
%{_bindir}/idle%{python_version}
%{_datadir}/applications/idle%{python_version}.desktop
+%if %{with appstream}
%dir %{_datadir}/metainfo
%{_datadir}/metainfo/idle%{python_version}.appdata.xml
+%endif
%{_datadir}/icons/hicolor/*/apps/idle%{python_version}.png
%dir %{_datadir}/icons/hicolor
%dir %{_datadir}/icons/hicolor/16x16
++++++ skip_SSL_tests.patch ++++++
---
Lib/test/test_ssl.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -139,9 +139,7 @@ def skip_if_broken_ubuntu_ssl(func):
try:
ssl.SSLContext(ssl.PROTOCOL_SSLv2)
except ssl.SSLError:
- if (ssl.OPENSSL_VERSION_INFO == (0, 9, 8, 15, 15) and
- platform.linux_distribution() == ('debian', 'squeeze/sid',
'')):
- raise unittest.SkipTest("Patched Ubuntu OpenSSL breaks
behaviour")
+ raise unittest.SkipTest("Patched Ubuntu OpenSSL breaks
behaviour")
return func(*args, **kwargs)
return f
else:
