From 16e2720a26ecd8194d1fcbf8797522e5340ced80 Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Jun 26 2018 19:58:54 +0000
Subject: Update to 2.0.6


- Clean spec
- Add upstream patch for new Flask compatibility (#1595388)

---

diff --git a/.gitignore b/.gitignore
index c0252a9..2d14ff7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /Flask-Script-0.6.2.tar.gz
 /Flask-Script-0.6.7.tar.gz
 /Flask-Script-2.0.5.tar.gz
+/Flask-Script-2.0.6.tar.gz
diff --git a/python-flask-script.spec b/python-flask-script.spec
index 0f82855..a96c2ac 100644
--- a/python-flask-script.spec
+++ b/python-flask-script.spec
@@ -1,30 +1,30 @@
 %global mod_name Flask-Script
 
 Name:       python-flask-script
-Version:    2.0.5
-Release:    13%{?dist}
+Version:    2.0.6
+Release:    1%{?dist}
 Summary:    Scripting support for Flask
 
 License:    BSD
 URL:        http://flask-script.readthedocs.org/en/latest/
 Source0:    https://pypi.python.org/packages/source/F/%{mod_name}/%{mod_name}-%{version}.tar.gz
 
+# using flask_script everywhere instead of flask.ext.script
+# adjusted https://github.com/smurfix/flask-script/commit/fcf894b6e4d0ad17489480b722c870aaea600db1
+Patch0:     fix-imports.patch
+
 BuildArch:  noarch
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
 BuildRequires:  python2-pytest
 BuildRequires:  python2-flask
-BuildRequires:  python2-sphinx
 BuildRequires:  python2-pytest
 
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  python%{python3_pkgversion}-pytest
 BuildRequires:  python%{python3_pkgversion}-flask
-%if 0%{?fedora} >= 27
 BuildRequires:  python%{python3_pkgversion}-sphinx
-#epel7 doesn't have python34-sphinx
-%endif
 BuildRequires:  python%{python3_pkgversion}-pytest
 
 %global _description\
@@ -54,40 +54,27 @@ scripts to set up your database, cronjobs, and other command-line tasks that
 belong outside the web application itself.
 
 %prep
-%setup -q -n %{mod_name}-%{version}
+%autosetup -p1 -n %{mod_name}-%{version}
 # delete the mac's .ds_store file
 rm -f docs/.DS_Store
 
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-
 %build
-%{__python2} setup.py build
+%py2_build
+%py3_build
+
 # generate sphinx documentation
-cd docs && make html
+cd docs && make SPHINXBUILD=sphinx-build-3 html
 # deleting unneeded buildinfo, we dont expect users to change html docs
 rm -f _build/html/.buildinfo
 
-pushd %{py3dir}
-%{__python3} setup.py build
-cd docs && make html
-rm -f _build/html/.buildinfo
-popd
 
 %check
-py.test-%{python2_version} tests.py
-%if 0%{?with_python3}
-pushd %{py3dir}
-py.test-%{python3_version} tests.py
-popd
-%endif
+py.test-2 tests.py
+py.test-3 tests.py
 
 %install
-%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-
-pushd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-popd
+%py2_install
+%py3_install
 
 
 %files -n python2-flask-script
@@ -98,9 +85,14 @@ popd
 %files -n python%{python3_pkgversion}-flask-script
 %doc docs/_build/html README.rst LICENSE 
 %{python3_sitelib}/*.egg-info/
-%{python3_sitelib}/flask_script
+%{python3_sitelib}/flask_script/
 
 %changelog
+* Tue Jun 26 2018 Miro Hrončok <mhroncok@redhat.com> - 2.0.6-1
+- Update to 2.0.6
+- Clean spec
+- Add upstream patch for new Flask compatibility (#1595388)
+
 * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 2.0.5-13
 - Rebuilt for Python 3.7
 
diff --git a/sources b/sources
index 799bf98..be6fb6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5c73d3b7937f5b88942f342f9617029  Flask-Script-2.0.5.tar.gz
+SHA512 (Flask-Script-2.0.6.tar.gz) = 03c51213be8e2b86f1f4450565cf4d7e3d9d7257ac017bd53830be57620d581f43bcfe959ef7b621af722c688c56495229aad3dd9654c8a8a5905db0105275fc