From 6ed57557f7803682132e4d8a608a18d7b484f6c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 6 May 2020 21:00:35 +0200
Subject: [PATCH] Rename from python36 to python3.6

See https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/message/VIUS7WMQMDX6H2WEIH7TVTMBB6SUHY7E/
---
 python36.rpmlintrc => python3.6.rpmlintrc | 12 ++++++------
 python36.spec => python3.6.spec           | 13 ++++++++-----
 tests/tests.yml                           |  2 +-
 3 files changed, 15 insertions(+), 12 deletions(-)
 rename python36.rpmlintrc => python3.6.rpmlintrc (82%)
 rename python36.spec => python3.6.spec (99%)

diff --git a/python36.rpmlintrc b/python3.6.rpmlintrc
similarity index 82%
rename from python36.rpmlintrc
rename to python3.6.rpmlintrc
index a4e9784..0659cca 100644
--- a/python36.rpmlintrc
+++ b/python3.6.rpmlintrc
@@ -13,13 +13,13 @@ addFilter(r'missing-call-to-chdir-with-chroot')
 
 # intentionally unversioned and selfobsoleted
 addFilter(r'unversioned-explicit-obsoletes python')
-addFilter(r'self-obsoletion python3\d obsoletes python3\d')
+addFilter(r'self-obsoletion python3\.\d obsoletes python3\.\d')
 
 # intentionally hardcoded
 addFilter(r'hardcoded-library-path in %{_prefix}/lib/(debug/%{_libdir}|python%{pybasever})')
 
 # intentional for our pythonXY package
-addFilter(r'python3\d\.[^:]+: (E|W): devel-file-in-non-devel-package')
+addFilter(r'python3\.\d\.[^:]+: (E|W): devel-file-in-non-devel-package')
 
 # we have non binary stuff, python files
 addFilter(r'only-non-binary-in-usr-lib')
@@ -36,7 +36,7 @@ addFilter(r'no-manual-page-for-binary python3.*-config$')
 addFilter(r'no-manual-page-for-binary python3.\dd?m$')
 
 # missing documentation from subpackages
-addFilter(r'^python3\d?-(debug|tkinter|test|idle)\.[^:]+: (E|W): no-documentation')
+addFilter(r'^python3(\.\d)?-(debug|tkinter|test|idle)\.[^:]+: (E|W): no-documentation')
 
 # platform python is obsoleted, but not provided
 addFilter(r'obsolete-not-provided platform-python')
@@ -48,16 +48,16 @@ addFilter(r'obsolete-not-provided platform-python')
 addFilter(r'%ifarch-applied-patch')
 
 # debugsource
-addFilter(r'^python3\d?-debugsource\.[^:]+: (E|W): no-documentation')
+addFilter(r'^python3(\.\d)?-debugsource\.[^:]+: (E|W): no-documentation')
 
 # debuginfo
-addFilter(r'^python3\d?-debuginfo\.[^:]+: (E|W): useless-provides debuginfo\(build-id\)')
+addFilter(r'^python3(\.\d)?-debuginfo\.[^:]+: (E|W): useless-provides debuginfo\(build-id\)')
 
 # this is OK for F28+
 addFilter(r'library-without-ldconfig-post')
 
 # debug package contains devel and non-devel files
-addFilter(r'python3\d?-debug.[^:]+: (E|W): (non-)?devel-file-in-(non-)?devel-package')
+addFilter(r'python3(\.\d)?-debug.[^:]+: (E|W): (non-)?devel-file-in-(non-)?devel-package')
 
 # this goes to other subpackage, hence not actually dangling, the read error is bogus
 addFilter(r'dangling-relative-symlink /usr/lib(64)?/pkgconfig/python-3\.\ddm\.pc python-3\.\d\.pc')
diff --git a/python36.spec b/python3.6.spec
similarity index 99%
rename from python36.spec
rename to python3.6.spec
index 5c58d3a..cba83a4 100644
--- a/python36.spec
+++ b/python3.6.spec
@@ -7,7 +7,7 @@
 # pybasever without the dot:
 %global pyshortver 36
 
-Name: python%{pyshortver}
+Name: python%{pybasever}
 Summary: Version %{pybasever} of the Python interpreter
 URL: https://www.python.org/
 
@@ -17,7 +17,7 @@ URL: https://www.python.org/
 #global prerel ...
 %global upstream_version %{general_version}%{?prerel}
 Version: %{general_version}%{?prerel:~%{prerel}}
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Python
 
 
@@ -384,9 +384,9 @@ Patch343: 00343-faulthandler-gcc10.patch
 # Descriptions, and metadata for subpackages
 # ==========================================
 
-# People might want to dnf install pythonX.Y instead of pythonXY;
-# we enable this in both flat and nonflat package.
-Provides: python%{pybasever} = %{version}-%{release}
+# Provide and obsolete the old python3X name
+Provides:  python%{pyshortver} = %{version}-%{release}
+Obsoletes: python%{pyshortver} < %{version}-%{release}
 
 %if %{without flatpackage}
 
@@ -1535,6 +1535,9 @@ CheckPython optimized
 # ======================================================
 
 %changelog
+* Wed May 06 2020 Miro Hrončok <mhroncok@redhat.com> - 3.6.10-4
+- Rename from python36 to python3.6
+
 * Wed Feb 12 2020 Miro Hrončok <mhroncok@redhat.com> - 3.6.10-3
 - Update the ensurepip module to work with setuptools >= 45
 
diff --git a/tests/tests.yml b/tests/tests.yml
index 92949c2..6869e7e 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -14,5 +14,5 @@
     required_packages:
     - gcc
     - python3-tox
-    - python36
+    - python3.6
     - glibc-all-langpacks # for locale tests