From 3f93629d9f7c212b9021c4982acf9e0d4ead59de Mon Sep 17 00:00:00 2001
From: jpzhang <jpzhang187@163.com>
Date: Tue, 11 Aug 2020 16:37:40 +0800
Subject: [PATCH 1/2] Remove python2-werkzeug subpackage

---
 python-werkzeug.spec | 53 +++++---------------------------------------
 1 file changed, 5 insertions(+), 48 deletions(-)

diff --git a/python-werkzeug.spec b/python-werkzeug.spec
index 9229677..efc2f8b 100644
--- a/python-werkzeug.spec
+++ b/python-werkzeug.spec
@@ -42,28 +42,6 @@ applications such as blogs, wikis, or bulletin boards.\
 
 %description %_description
 
-%package -n python2-werkzeug
-Summary: %summary
-
-BuildRequires:  python2-devel python2-setuptools git
-# For tests
-BuildRequires:  python2-pytest python2-hypothesis python2-requests python2-pyOpenSSL
-BuildRequires:  python2-greenlet python2-redis
-
-%{?python_provide:%python_provide python2-werkzeug}
-
-%description -n python2-werkzeug %_description
-
-%package -n python2-werkzeug-doc
-Summary:        Documentation for %{name}
-BuildRequires:  python2-sphinx
-Requires:       python2-werkzeug = %{version}-%{release}
-%{?python_provide:%python_provide python2-werkzeug-doc}
-
-%description -n python2-werkzeug-doc
-Documentation and examples for %{name}.
-
-
 %package -n python3-werkzeug
 Summary:        %summary
 
@@ -94,10 +72,8 @@ Documentation and examples for python3-werkzeug.
 tar -xf %{SOURCE1}
 find -name '_themes' -type d -exec cp -r {} docs/ \;
 
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
-
+find . -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
+sed -i "s/'python'/'python3'/ p" tests/test_serving.py
 
 %build
 werkzeug_build() {
@@ -111,13 +87,8 @@ werkzeug_build() {
 	popd
 }
 
-%py2_build
-werkzeug_build
-
-pushd %{py3dir}
 %py3_build
 werkzeug_build
-popd
 
 
 %install
@@ -125,28 +96,11 @@ werkzeug_install() {
 	%{__rm} -rf docs/_build/html/.buildinfo
 	%{__rm} -rf examples/cupoftee/db.pyc
 }
-%py2_install
-werkzeug_install
-
-pushd %{py3dir}
 %py3_install
 werkzeug_install
-popd
 
 %check
-PYTHONPATH=./ py.test-2
-
-pushd %{py3dir}
 PYTHONPATH=./ py.test-3
-popd
-
-%files -n python2-werkzeug
-%license LICENSE AUTHORS
-%doc PKG-INFO CHANGES.rst
-%{python2_sitelib}/*
-
-%files -n python2-werkzeug-doc
-%doc docs/_build/html examples
 
 %files -n python3-werkzeug
 %license LICENSE AUTHORS
@@ -158,6 +112,9 @@ popd
 
 
 %changelog
+* Tue Aug 11 2020 zhangjiapeng <zhangjiapeng@huawei.com> - 0.14.1-8
+- Remove python2-werkzeug subpackage
+
 * Wed Jun 24 2020 lingsheng <lingsheng@huawei.com> - 0.14.1-7
 - Fix test fail with python3.8
 
-- 
Gitee


From ed7f004f780819e8821565cca939840cd4018e81 Mon Sep 17 00:00:00 2001
From: jpzhang <jpzhang187@163.com>
Date: Tue, 11 Aug 2020 16:53:17 +0800
Subject: [PATCH 2/2] Remove python2-werkzeug subpackage

---
 python-werkzeug.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python-werkzeug.spec b/python-werkzeug.spec
index efc2f8b..b82737c 100644
--- a/python-werkzeug.spec
+++ b/python-werkzeug.spec
@@ -4,7 +4,7 @@
 Name:           python-werkzeug
 Summary:        A comprehensive WSGI web application library
 Version:        0.14.1
-Release:        7
+Release:        8
 License:        BSD
 URL:            http://werkzeug.pocoo.org/
 Source0:        https://files.pythonhosted.org/packages/source/W/Werkzeug/%{srcname}-%{version}.tar.gz
-- 
Gitee