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

@@ -14,7 +14,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}.2
+Release: 51%{?dist}.2.alma.1
 License: Python
 
 
@@ -798,6 +798,7 @@ Patch404: 00404-cve-2023-40217.patch
 #
 #     https://fedoraproject.org/wiki/SIGs/Python/PythonPatches
 
+Patch1000: python-3.6-almalinux_support.patch
 
 # ==========================================
 # Descriptions, and metadata for subpackages
@@ -1137,6 +1138,8 @@ git apply %{PATCH351}
 %patch399 -p1
 %patch404 -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
@@ -2067,6 +2070,9 @@ fi
 # ======================================================
 
 %changelog
+* Tue Oct 24 2023 Andrew Lukoshko <alukoshko@almalinux.org> - 3.6.8-51.2.alma.1
+- Add AlmaLinux to supported distros
+
 * Wed Sep 27 2023 Masahiro Matsuya <mmatsuya@redhat.com> - 3.6.8-51.2
 - Security fix for CVE-2023-40217
 Resolves: RHEL-2933