diff --git a/python-openstackclient.spec b/python-openstackclient.spec index 858d4b8..c2d6a17 100644 --- a/python-openstackclient.spec +++ b/python-openstackclient.spec @@ -1,6 +1,6 @@ Name: python-openstackclient Version: 0.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OpenStack Command-line Client Group: Development/Languages @@ -14,7 +14,7 @@ BuildRequires: python2-devel BuildRequires: python-setuptools BuildRequires: python-pbr BuildRequires: python-d2to1 -BuildRequires: python-sphinx +BuildRequires: python-sphinx10 Requires: python-pbr Requires: python-cliff @@ -34,7 +34,7 @@ actual REST API client actions. Summary: Documentation for OpenStack Nova API Client Group: Documentation -BuildRequires: python-sphinx +BuildRequires: python-sphinx10 Requires: %{name} = %{version}-%{release} @@ -56,17 +56,17 @@ rm -rf python_openstackclient.egg-info rm -rf requirements.txt test-requirements.txt %build -%{__python2} setup.py build +%{__python} setup.py build %install -%{__python2} setup.py install -O1 --skip-build --root %{buildroot} +%{__python} setup.py install -O1 --skip-build --root %{buildroot} # Delete tests rm -fr %{buildroot}%{python_sitelib}/openstackclient/tests export PYTHONPATH="$( pwd ):$PYTHONPATH" -sphinx-build -b html doc/source html -sphinx-build -b man doc/source man +sphinx-1.0-build -b html doc/source html +sphinx-1.0-build -b man doc/source man install -p -D -m 644 man/openstack.1 %{buildroot}%{_mandir}/man1/openstack.1 @@ -84,6 +84,11 @@ rm -fr html/.doctrees html/.buildinfo %doc html %changelog +* Thu Nov 21 2013 Jakub Ruzicka 0.2.2-3 +- EL6 specific changes +- Use python-sphinx10 package +- Don't use %{_python2} macro + * Tue Nov 19 2013 Jakub Ruzicka 0.2.2-2 - doc subpackage now requires main package - Use %{__python2} macro instead of %{__python}