From 52427289b595100570b1b3413b6530589c72b3f4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Fri, 17 Jan 2020 13:58:01 +0100 Subject: [PATCH] - up to 1.1.1 --- ...-sphinxcontrib.log_cabinet-extension.patch | 13 ++++---- 0002-remove-DocVersion-related.patch | 33 ------------------- ...fix-issue-no-theme-named-flask-found.patch | 20 ----------- 0004-empty-CONTRIBUTING-rst.patch | 8 ----- python-flask.spec | 27 +++++++-------- 5 files changed, 18 insertions(+), 83 deletions(-) delete mode 100644 0002-remove-DocVersion-related.patch delete mode 100644 0003-fix-issue-no-theme-named-flask-found.patch delete mode 100644 0004-empty-CONTRIBUTING-rst.patch diff --git a/0001-Don-t-require-sphinxcontrib.log_cabinet-extension.patch b/0001-Don-t-require-sphinxcontrib.log_cabinet-extension.patch index 3e0848c..795d6ce 100644 --- a/0001-Don-t-require-sphinxcontrib.log_cabinet-extension.patch +++ b/0001-Don-t-require-sphinxcontrib.log_cabinet-extension.patch @@ -11,11 +11,12 @@ diff --git a/docs/conf.py b/docs/conf.py index 0417244..dd13886 100644 --- a/docs/conf.py +++ b/docs/conf.py -@@ -20,7 +20,6 @@ master_doc = 'index' +@@ -14,7 +14,6 @@ master_doc = "index" extensions = [ - 'sphinx.ext.autodoc', - 'sphinx.ext.intersphinx', -- 'sphinxcontrib.log_cabinet', + "sphinx.ext.autodoc", + "sphinx.ext.intersphinx", +- "sphinxcontrib.log_cabinet", + "pallets_sphinx_themes", + "sphinx_issues", ] - - intersphinx_mapping = { + diff --git a/0002-remove-DocVersion-related.patch b/0002-remove-DocVersion-related.patch deleted file mode 100644 index 39ab84c..0000000 --- a/0002-remove-DocVersion-related.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 067c772588f69f397eeff70019320506b47bb239 Mon Sep 17 00:00:00 2001 -From: chengkang <1412950785@qq.com> -Date: Mon, 17 Sep 2018 21:05:53 +0800 -Subject: [PATCH] remove DocVersion related -Origin: https://github.com/pallets/flask/commit/067c772588f69f397eeff70019320506b47bb239 - ---- - docs/conf.py | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -4,7 +4,7 @@ - import inspect - import re - --from pallets_sphinx_themes import DocVersion, ProjectLink, get_version -+from pallets_sphinx_themes import ProjectLink, get_version - - # Project -------------------------------------------------------------- - -@@ -45,11 +45,6 @@ - ProjectLink( - 'Issue Tracker', 'https://github.com/pallets/flask/issues/'), - ], -- 'versions': [ -- DocVersion('dev', 'Development', 'unstable'), -- DocVersion('1.0', 'Flask 1.0', 'stable'), -- DocVersion('0.12', 'Flask 0.12'), -- ], - 'canonical_url': 'http://flask.pocoo.org/docs/{}/'.format(version), - 'carbon_ads_args': 'zoneid=1673&serve=C6AILKT&placement=pocooorg', - } diff --git a/0003-fix-issue-no-theme-named-flask-found.patch b/0003-fix-issue-no-theme-named-flask-found.patch deleted file mode 100644 index 59bc9c8..0000000 --- a/0003-fix-issue-no-theme-named-flask-found.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 3e86fd25e9638898618cda8352402f4281bf809b Mon Sep 17 00:00:00 2001 -From: chengkang <1412950785@qq.com> -Date: Mon, 17 Sep 2018 16:18:52 +0800 -Subject: [PATCH] fix issue: no theme named 'flask' found -Origin: https://github.com/pallets/flask/commit/3e86fd25e9638898618cda8352402f4281bf809b - ---- - docs/conf.py | 1 + - 1 file changed, 1 insertion(+) - ---- a/docs/conf.py -+++ b/docs/conf.py -@@ -20,6 +20,7 @@ - extensions = [ - 'sphinx.ext.autodoc', - 'sphinx.ext.intersphinx', -+ 'pallets_sphinx_themes', - ] - - intersphinx_mapping = { diff --git a/0004-empty-CONTRIBUTING-rst.patch b/0004-empty-CONTRIBUTING-rst.patch deleted file mode 100644 index 2e2fc40..0000000 --- a/0004-empty-CONTRIBUTING-rst.patch +++ /dev/null @@ -1,8 +0,0 @@ -Author: Ondřej Nový -Description: Add empty CONTRIBUTING.rst -Forwarded: sort of, https://github.com/pallets/flask/pull/2913 - ---- /dev/null -+++ b/CONTRIBUTING.rst -@@ -0,0 +1 @@ -+ diff --git a/python-flask.spec b/python-flask.spec index 4037673..35a5b8b 100644 --- a/python-flask.spec +++ b/python-flask.spec @@ -9,17 +9,15 @@ Summary: A microframework based on Werkzeug, Jinja2 and good intentions Summary(pl.UTF-8): Mikroszkielet oparty na Werkzeugu, Jinja2 i dobrych intencjach Name: python-%{module} -Version: 1.0.2 -Release: 3 +Version: 1.1.1 +Release: 1 License: BSD Group: Development/Languages/Python #Source0Download: https://pypi.python.org/simple/Flask -Source0: https://files.pythonhosted.org/packages/source/F/Flask/Flask-%{version}.tar.gz -# Source0-md5: 824f0f20aae1f44c9c7dc4054adb7969 +# Source0: https://files.pythonhosted.org/packages/source/F/Flask/Flask-%{version}.tar.gz +Source0: https://pypi.debian.net/Flask/Flask-%{version}.tar.gz +# Source0-md5: 0e3ed44ece1c489ed835d1b7047e349c Patch0: 0001-Don-t-require-sphinxcontrib.log_cabinet-extension.patch -Patch1: 0002-remove-DocVersion-related.patch -Patch2: 0003-fix-issue-no-theme-named-flask-found.patch -Patch3: 0004-empty-CONTRIBUTING-rst.patch URL: http://flask.pocoo.org/ %if %{with tests} && %(locale -a | grep -q '^C\.UTF-8$'; echo $?) BuildRequires: glibc-localedb-all @@ -32,7 +30,7 @@ BuildRequires: python-jinja2 >= 2.4 BuildRequires: python-modules >= 1:2.6 BuildRequires: python-pytest BuildRequires: python-setuptools -BuildRequires: python-werkzeug >= 0.7 +BuildRequires: python-werkzeug >= 0.15 %endif %if %{with python3} BuildRequires: python3-click >= 2.0 @@ -42,7 +40,7 @@ BuildRequires: python3-jinja2 >= 2.4 BuildRequires: python3-modules >= 1:3.3 BuildRequires: python3-pytest BuildRequires: python3-setuptools -BuildRequires: python3-werkzeug >= 0.7 +BuildRequires: python3-werkzeug >= 0.15 %endif %if %{with doc} BuildRequires: sphinx-pdg @@ -89,21 +87,18 @@ Dokumentacja do pakietu Pythona Flask. %prep %setup -q -n Flask-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %if %{with python2} %py_build -%{?with_tests:%{__python} -m pytest tests} +%{?with_tests:PYTHONPATH=$(pwd)/build-2/lib %{__python} -m pytest tests} %endif %if %{with python3} %py3_build -%{?with_tests:LC_ALL=C.UTF-8 %{__python3} -m pytest tests} +%{?with_tests:LC_ALL=C.UTF-8 PYTHONPATH=$(pwd)/build-3/lib %{__python3} -m pytest tests} %endif %if %{with doc} @@ -141,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with python2} %files %defattr(644,root,root,755) -%doc AUTHORS CHANGES.rst LICENSE README.rst +%doc CHANGES.rst LICENSE.rst README.rst %attr(755,root,root) %{_bindir}/flask %attr(755,root,root) %{_bindir}/flask-2 %{py_sitescriptdir}/flask @@ -154,7 +149,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with python3} %files -n python3-%{module} %defattr(644,root,root,755) -%doc AUTHORS CHANGES.rst LICENSE README.rst +%doc CHANGES.rst LICENSE.rst README.rst %attr(755,root,root) %{_bindir}/flask-3 %{py3_sitescriptdir}/flask %{py3_sitescriptdir}/Flask-%{version}-py*.egg-info -- 2.43.0