Kolab Groupware OBS

Changes of Revision 2

python-flask-script.spec Changed

@@ -19,8 +19,10 @@
 BuildRequires:  pytest
 BuildRequires:  python-flask
 BuildRequires:  python-sphinx
+BuildRequires:  python-argparse
 BuildRequires:  pytest
 %if 0%{?with_python3}
+BuildRequires:  python3-argparse
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-pytest
@@ -60,9 +62,9 @@
 %endif
 
 %build
-%{__python2} setup.py build
+%{__python} setup.py build
 # generate sphinx documentation
-cd docs && make html
+cd docs && make html || :
 # deleting unneeded buildinfo, we dont expect users to change html docs
 rm -f _build/html/.buildinfo
 
@@ -75,7 +77,7 @@
 %endif
 
 %check
-py.test-%{python2_version} tests.py
+py.test tests.py
 %if 0%{?with_python3}
 pushd %{py3dir}
 py.test-%{python3_version} tests.py
@@ -83,7 +85,7 @@
 %endif
 
 %install
-%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 
 %if 0%{?with_python3}
 pushd %{py3dir}
@@ -94,8 +96,8 @@
 
 %files
 %doc docs/_build/html README.rst LICENSE 
-%{python2_sitelib}/*.egg-info/
-%{python2_sitelib}/flask_script/*.py*
+%{python_sitelib}/*.egg-info/
+%{python_sitelib}/flask_script/*.py*
 
 %if 0%{?with_python3}
 %files -n python3-flask-script