Merge branch 'c8' into a8

SOURCES/python-3.6-almalinux_support.patch

@@ -0,0 +1,12 @@
+diff -Naur Python-3.6.8.orig/Lib/platform.py Python-3.6.8.almalinux/Lib/platform.py
+--- Python-3.6.8.orig/Lib/platform.py	2018-12-24 00:37:14.000000000 +0300
++++ Python-3.6.8.almalinux/Lib/platform.py	2021-03-09 11:46:50.252385459 +0300
+@@ -297,7 +297,7 @@
+ # and http://www.die.net/doc/linux/man/man1/lsb_release.1.html
+ 
+ _supported_dists = (
+-    'SuSE', 'debian', 'fedora', 'redhat', 'centos',
++    'SuSE', 'debian', 'fedora', 'redhat', 'centos', 'almalinux',
+     'mandrake', 'mandriva', 'rocks', 'slackware', 'yellowdog', 'gentoo',
+     'UnitedLinux', 'turbolinux', 'arch', 'mageia')
+ 

SPECS/python3.spec

@@ -1,7 +1,6 @@
 # ==================
 # Top-level metadata
 # ==================
-
 Name: python3
 Summary: Interpreter of the Python programming language
 URL: https://www.python.org/
@@ -14,7 +13,7 @@ URL: https://www.python.org/
 #  WARNING  When rebasing to a new Python version,
 #           remember to update the python3-docs package as well
 Version: %{pybasever}.8
-Release: 51%{?dist}
+Release: 51%{?dist}.alma
 License: Python
 
 
@@ -774,6 +773,7 @@ Patch394: 00394-cve-2022-45061-cpu-denial-of-service-via-inefficient-idna-decode
 #
 #     https://fedoraproject.org/wiki/SIGs/Python/PythonPatches
 
+Patch1000: python-3.6-almalinux_support.patch
 
 # ==========================================
 # Descriptions, and metadata for subpackages
@@ -1111,6 +1111,8 @@ git apply %{PATCH351}
 %patch387 -p1
 %patch394 -p1
 
+%patch1000 -p1
+
 # Remove files that should be generated by the build
 # (This is after patching, so that we can use patches directly from upstream)
 rm configure pyconfig.h.in
@@ -2041,6 +2043,9 @@ fi
 # ======================================================
 
 %changelog
+* Wed May 17 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 3.6.8-51.alma
+- Add AlmaLinux to supported distros
+
 * Tue Jan 24 2023 Charalampos Stratakis <cstratak@redhat.com> - 3.6.8-51
 - Properly strip the LTO bytecode from python.o
 Resolves: rhbz#2137707
@@ -2061,7 +2066,6 @@ Resolves: rhbz#2136435
 * Tue Jun 14 2022 Charalampos Stratakis <cstratak@redhat.com> - 3.6.8-47
 - Security fix for CVE-2015-20107
 Resolves: rhbz#2075390
-
 * Wed Mar 09 2022 Charalampos Stratakis <cstratak@redhat.com> - 3.6.8-46
 - Security fix for CVE-2022-0391: urlparse does not sanitize URLs containing ASCII newline and tabs
 - Fix the test suite support for Expat >= 2.4.5