From 7533ac10ddfc06c821ad9abb95fc7cbf118f1688 Mon Sep 17 00:00:00 2001 From: 19909236985 Date: Fri, 30 Oct 2020 14:40:34 +0800 Subject: [PATCH 1/2] remove python2 --- python-markupsafe.spec | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/python-markupsafe.spec b/python-markupsafe.spec index cbf2e83..d0a0401 100644 --- a/python-markupsafe.spec +++ b/python-markupsafe.spec @@ -5,22 +5,17 @@ This mitigates injection attacks, meaning untrusted user input can safely be dis Name: python-markupsafe Version: 1.1.1 -Release: 6 +Release: 8 Summary: Safely add untrusted strings to HTML/XML markup. License: BSD URL: https://pypi.org/project/MarkupSafe/ Source0: https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-%{version}.tar.gz %description %_description -%package -n python2-markupsafe -Summary: %{summary} -BuildRequires: python2-devel python2-setuptools -%{?python_provide:%python_provide python2-markupsafe} -%description -n python2-markupsafe %_description %package -n python3-markupsafe Summary: %{summary} -BuildRequires: python3-devel python2-setuptools +BuildRequires: python3-devel python3-setuptools %{?python_provide:%python_provide python3-markupsafe} %description -n python3-markupsafe %_description @@ -31,24 +26,16 @@ BuildRequires: python3-devel python2-setuptools %autosetup -n MarkupSafe-%{version} %build -%py2_build %py3_build %install -%py2_install %py3_install %check -%{__python2} setup.py test %{__python3} setup.py test -%files -n python2-markupsafe -%{python2_sitearch}/*.egg-info/ -%exclude %{python2_sitearch}/markupsafe/_speedups.c -%{python2_sitearch}/markupsafe/ - %files -n python3-markupsafe %{python3_sitearch}/*.egg-info/ %exclude %{python3_sitearch}/markupsafe/_speedups.c @@ -58,6 +45,12 @@ BuildRequires: python3-devel python2-setuptools %doc README.rst %changelog +* Fri Oct 30 2020 wuchaochao - 1.1.1-7 +- Type:bufix +- CVE:NA +- SUG:NA +- DESC:remove python2 + * Sat Jul 25 2020 tianwei - 1.1.1-6 - Type:enhancement - ID:NA -- Gitee From a4a488e576d8b039d5aa74e540a356510ee8fa00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E8=B6=85=E8=B6=85?= Date: Fri, 30 Oct 2020 14:56:25 +0800 Subject: [PATCH 2/2] update python-markupsafe.spec. --- python-markupsafe.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-markupsafe.spec b/python-markupsafe.spec index d0a0401..79cc667 100644 --- a/python-markupsafe.spec +++ b/python-markupsafe.spec @@ -5,7 +5,7 @@ This mitigates injection attacks, meaning untrusted user input can safely be dis Name: python-markupsafe Version: 1.1.1 -Release: 8 +Release: 7 Summary: Safely add untrusted strings to HTML/XML markup. License: BSD URL: https://pypi.org/project/MarkupSafe/ -- Gitee