Merge branch 'release_0_31_fixes'

avocado.spec

@@ -14,7 +14,7 @@ URL: http://avocado-framework.github.io/
 Source0: https://github.com/avocado-framework/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 BuildArch: noarch
 Requires: python, python-requests, fabric, pyliblzma, libvirt-python, pystache, gdb, gdb-gdbserver, python-stevedore
-BuildRequires: python2-devel, python-setuptools, python-docutils, python-mock, python-psutil, python-sphinx, python-requests, aexpect, pystache, yum
+BuildRequires: python2-devel, python-setuptools, python-docutils, python-mock, python-psutil, python-sphinx, python-requests, aexpect, pystache, yum, python-stevedore
 
 %if 0%{?el6}
 Requires: PyYAML
@@ -74,8 +74,8 @@ selftests/run
 %{_mandir}/man1/avocado-rest-client.1.gz
 %{_docdir}/avocado/avocado.rst
 %{_docdir}/avocado/avocado-rest-client.rst
-%exclude %{python_sitelib}/avocado/core/plugins/htmlresult.py*
-%exclude %{python_sitelib}/avocado/core/plugins/resources/htmlresult/*
+%exclude %{python_sitelib}/avocado/plugins/html.py*
+%exclude %{python_sitelib}/avocado/core/resources/htmlresult/*
 %{_libexecdir}/avocado/avocado-bash-utils
 %{_libexecdir}/avocado/avocado_debug
 %{_libexecdir}/avocado/avocado_error
@@ -92,8 +92,8 @@ directory. It also gives the user the ability to write a report on an
 arbitrary filesystem location.
 
 %files plugins-output-html
-%{python_sitelib}/avocado/core/plugins/htmlresult.py*
-%{python_sitelib}/avocado/core/plugins/resources/htmlresult/*
+%{python_sitelib}/avocado/plugins/html.py*
+%{python_sitelib}/avocado/core/resources/htmlresult/*
 
 %package examples
 Summary: Avocado Test Framework Example Tests

docs/source/GetStartedGuide.rst

@@ -58,7 +58,7 @@ Then to install Avocado from the git repository run::
 
     git clone git://github.com/avocado-framework/avocado.git
     cd avocado
-    sudo pip install -r requirements.txt
+    sudo make requirements
     sudo python setup.py install
 
 Note that `python` and `pip` should point to the Python interpreter version 2.7.x.