diff --git a/10000-python-anolos-rebrand.patch b/10000-python-anolos-rebrand.patch deleted file mode 100644 index 1429856643fab358312ce0ebb816a1e518057fd9..0000000000000000000000000000000000000000 --- a/10000-python-anolos-rebrand.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 7c9b640079d76f8f8ffec6cffd64954591c7cc82 Mon Sep 17 00:00:00 2001 -From: liuzhilin -Date: Thu, 9 Sep 2021 02:19:50 +0000 -Subject: [PATCH] python-anolos-rebrand - ---- - Doc/library/gettext.rst | 2 +- - Doc/library/platform.rst | 4 ++-- - Lib/platform.py | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Doc/library/gettext.rst b/Doc/library/gettext.rst -index 9b4eb0c..b0c1585 100644 ---- a/Doc/library/gettext.rst -+++ b/Doc/library/gettext.rst -@@ -746,7 +746,7 @@ implementations, and valuable experience to the creation of this module: - - .. rubric:: Footnotes - --.. [#] The default locale directory is system dependent; for example, on RedHat Linux -+.. [#] The default locale directory is system dependent; for example, on Anolis OS - it is :file:`/usr/share/locale`, but on Solaris it is :file:`/usr/lib/locale`. - The :mod:`gettext` module does not try to support these system dependent - defaults; instead its default is :file:`sys.prefix/share/locale`. For this -diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst -index 26f587e..a18aecc 100644 ---- a/Doc/library/platform.rst -+++ b/Doc/library/platform.rst -@@ -242,7 +242,7 @@ Unix Platforms - -------------- - - --.. function:: dist(distname='', version='', id='', supported_dists=('SuSE','debian','redhat','mandrake',...)) -+.. function:: dist(distname='', version='', id='', supported_dists=('SuSE','debian','redhat','mandrake','anolis',...)) - - This is an old version of the functionality now provided by - :func:`linux_distribution`. For new code, please use the -@@ -254,7 +254,7 @@ Unix Platforms - - .. deprecated:: 2.6 - --.. function:: linux_distribution(distname='', version='', id='', supported_dists=('SuSE','debian','redhat','mandrake',...), full_distribution_name=1) -+.. function:: linux_distribution(distname='', version='', id='', supported_dists=('SuSE','debian','redhat','mandrake','anolis',...), full_distribution_name=1) - - Tries to determine the name of the Linux OS distribution name. - -diff --git a/Lib/platform.py b/Lib/platform.py -index c0016a8..837a86d 100755 ---- a/Lib/platform.py -+++ b/Lib/platform.py -@@ -258,7 +258,7 @@ _release_version = re.compile(r'([^0-9]+)' - - _supported_dists = ( - 'SuSE', 'debian', 'fedora', 'redhat', 'centos', -- 'mandrake', 'mandriva', 'rocks', 'slackware', 'yellowdog', 'gentoo', -+ 'mandrake','anolis','mandriva', 'rocks', 'slackware', 'yellowdog', 'gentoo', - 'UnitedLinux', 'turbolinux') - - def _parse_release_file(firstline): --- -1.8.3.1 - diff --git a/python.spec b/python.spec index 65c123a9a05af4fe37e82ffe5d2d8d304ef01bea..4c90eb420fdcb2323c944648db513626895353a1 100644 --- a/python.spec +++ b/python.spec @@ -2,7 +2,7 @@ # ====================================================== # Conditionals and other variables controlling the build # ====================================================== -%define anolis_release .0.1 + %{!?__python_ver:%global __python_ver EMPTY} #global __python_ver 27 %global unicode ucs4 @@ -114,7 +114,7 @@ Summary: An interpreted, interactive, object-oriented programming language Name: %{python} # Remember to also rebase python-docs when changing this: Version: 2.7.5 -Release: 90%{anolis_release}%{?dist} +Release: 90%{?dist} License: Python Group: Development/Languages Requires: %{python}-libs%{?_isa} = %{version}-%{release} @@ -1359,10 +1359,6 @@ Patch351: 00351-cve-2019-20907-fix-infinite-loop-in-tarfile.patch # above: Patch5000: 05000-autotool-intermediates.patch -#Add by Anolis -Patch10000: 10000-python-anolos-rebrand.patch -#End - Patch99999: 99999-python-2.7.5-issues-17979-17998.patch # ====================================================== @@ -1804,9 +1800,6 @@ find -name "*~" |xargs rm -f %patch5000 -p0 -b .autotool-intermediates %endif -#Add by Anolis -%patch10000 -p1 -#End # ====================================================== # Configuring and building the code: @@ -2670,9 +2663,6 @@ rm -fr %{buildroot} # ====================================================== %changelog -* Thu Sep 09 2021 liuzhilin - 2.7.5-90.0.1 -- Rebrand:rebrand for anolis - * Fri Jul 31 2020 Charalampos Stratakis - 2.7.5-90 - Avoid infinite loop when reading specially crafted TAR files (CVE-2019-20907) Resolves: rhbz#1856481