From 44eaad7e093220fabf9c60d9e5b4759778a5f41c Mon Sep 17 00:00:00 2001 From: Robert Kuska Date: Sep 25 2013 10:35:02 +0000 Subject: Update the source and add python3 support --- diff --git a/.gitignore b/.gitignore index 03fc99c..6c620bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /Flask-Script-0.5.3.tar.gz +/Flask-Script-0.6.2.tar.gz diff --git a/python-flask-script.spec b/python-flask-script.spec index 987db20..5d58d70 100644 --- a/python-flask-script.spec +++ b/python-flask-script.spec @@ -1,8 +1,12 @@ %global mod_name Flask-Script +%if 0%{?fedora} > 12 +%global with_python3 1 +%endif + Name: python-flask-script -Version: 0.5.3 -Release: 4%{?dist} +Version: 0.6.2 +Release: 1%{?dist} Summary: Scripting support for Flask License: BSD @@ -12,11 +16,20 @@ Source0: https://pypi.python.org/packages/source/F/%{mod_name}/%{mod_name}-%{ BuildArch: noarch BuildRequires: python2-devel BuildRequires: python-setuptools -# for check purpose nose is needed -BuildRequires: python-nose +BuildRequires: pytest BuildRequires: python-flask BuildRequires: python-sphinx +%if 0%{?with_python3} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-pytest +BuildRequires: python3-flask +BuildRequires: python3-sphinx +%endif Requires: python-flask +%if 0%{?with_python3} +Requires: python3-flask +%endif %description The Flask-Script extension provides support for writing external scripts in @@ -24,12 +37,27 @@ Flask.This includes running a development server, a customized Python shell, scripts to set up your database, cronjobs, and other command-line tasks that belong outside the web application itself. +%if 0%{?with_python3} +%package -n python3-flask-script +Summary: Scripting support for flask in python3-flask + +%description -n python3-flask-script +The Flask-Script extension provides support for writing external scripts in +Flask.This includes running a development server, a customized Python shell, +scripts to set up your database, cronjobs, and other command-line tasks that +belong outside the web application itself. +%endif %prep %setup -q -n %{mod_name}-%{version} # delete the mac's .ds_store file rm -f docs/.DS_Store +%if 0%{?with_python3} +rm -rf %{py3dir} +cp -a . %{py3dir} +%endif + %build %{__python} setup.py build # generate sphinx documentation @@ -37,18 +65,49 @@ cd docs && make html # deleting unneeded buildinfo, we dont expect users to change html docs rm -f _build/html/.buildinfo +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py build +cd docs && make html +rm -f _build/html/.buildinfo +popd +%endif + %check %{__python} setup.py test +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py test +popd +%endif + %install %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%if 0%{?with_python3} +pushd %{py3dir} +%{__python3} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +popd +%endif + + %files %doc docs/_build/html README.rst LICENSE %{python_sitelib}/*.egg-info/ %{python_sitelib}/flask_script/*.py* +%if 0%{?with_python3} +%files -n python3-flask-script +%doc docs/_build/html README.rst LICENSE +%{python3_sitelib}/*.egg-info/ +%{python3_sitelib}/flask_script +%endif + %changelog +* Wed Sep 25 2013 Robert Kuska - 0.6.2-1 +- Updated source to latest upstream version and added python3 support + * Tue Aug 06 2013 Robert Kuska - 0.5.3-4 - Fix BuildRequires diff --git a/sources b/sources index d749e49..1ca9336 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5a11584345ed72ec7ee1df5f4f9dc37 Flask-Script-0.5.3.tar.gz +09678a4279714ed5addfcc2620894d64 Flask-Script-0.6.2.tar.gz