From 943d2aeabb100b330459b9646ad00a05a398fb25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=C3=AFkel=20Gu=C3=A9mar?= Date: Mon, 16 Jul 2012 10:55:26 +0200 Subject: [PATCH] upstream 0.9 spec cleanups --- .gitignore | 1 + python-flask.spec | 29 ++++++++++++----------------- sources | 2 +- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 4371564..2f4eccc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /Flask-0.7.2.tar.gz /Flask-0.8.tar.gz /Flask-0.8.1.tar.gz +/Flask-0.9.tar.gz diff --git a/python-flask.spec b/python-flask.spec index fcb3edb..ecb31ca 100644 --- a/python-flask.spec +++ b/python-flask.spec @@ -1,10 +1,8 @@ -%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - %global srcname Flask -%global srcversion 0.8.1 +%global srcversion 0.9 Name: python-flask -Version: 0.8.1 +Version: 0.9.0 Release: 1%{?dist} Summary: A micro-framework for Python based on Werkzeug, Jinja 2 and good intentions @@ -12,7 +10,6 @@ Group: Development/Libraries License: BSD URL: http://flask.pocoo.org/ Source0: http://pypi.python.org/packages/source/F/Flask/%{srcname}-%{srcversion}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python2-devel @@ -49,18 +46,17 @@ Documentation and examples for %{name}. %{__python} setup.py build %install -rm -rf $RPM_BUILD_ROOT -%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +%{__python} setup.py install -O1 --skip-build --root %{buildroot} # Need to install flask in the setuptools "develop" mode to build docs # The BuildRequires on Werkzeug, Jinja2 and Sphinx is due to this as well. -export PYTHONPATH=$RPM_BUILD_ROOT%{python_sitelib} -%{__python} setup.py develop --install-dir $RPM_BUILD_ROOT%{python_sitelib} +export PYTHONPATH=%{buildroot}%{python_sitelib} +%{__python} setup.py develop --install-dir %{buildroot}%{python_sitelib} make -C docs html -rm -rf $RPM_BUILD_ROOT%{python_sitelib}/site.py -rm -rf $RPM_BUILD_ROOT%{python_sitelib}/site.py[co] -rm -rf $RPM_BUILD_ROOT%{python_sitelib}/easy-install.pth +rm -rf %{buildroot}%{python_sitelib}/site.py +rm -rf %{buildroot}%{python_sitelib}/site.py[co] +rm -rf %{buildroot}%{python_sitelib}/easy-install.pth rm -rf docs/_build/html/.buildinfo rm -rf examples/minitwit/*.pyc rm -rf examples/flaskr/*.pyc @@ -69,21 +65,20 @@ rm -rf examples/jqueryexample/*.pyc %check %{__python} setup.py test -%clean -rm -rf $RPM_BUILD_ROOT - %files -%defattr(-,root,root,-) %doc AUTHORS LICENSE PKG-INFO CHANGES README %{python_sitelib}/*.egg-info %{python_sitelib}/*.egg-link %{python_sitelib}/flask %files doc -%defattr(-,root,root,-) %doc docs/_build/html examples %changelog +* Mon Jul 2 2012 Haïkel Guémar - 0.9.0-1 +- upstream 0.9 +- spec cleanups + * Sun Jul 1 2012 Haïkel Guémar - 0.8.1-1 - upstream 0.8.1 (minor bugfixes) diff --git a/sources b/sources index b5bd667..55b4fdb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4b9e866bf43723d834b3ce8fcd13574d Flask-0.8.1.tar.gz +4a89ef2b3ab0f151f781182bd0cc8933 Flask-0.9.tar.gz