diff --git a/.gitignore b/.gitignore index 6f0d32c..0f456a8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /python-novaclient-2.10.0.tar.gz /python-novaclient-2.11.1.tar.gz /python-novaclient-2.13.0.tar.gz +/python-novaclient-2.14.1.tar.gz diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch new file mode 100644 index 0000000..fa64c76 --- /dev/null +++ b/0001-Remove-runtime-dependency-on-python-pbr.patch @@ -0,0 +1,22 @@ +From 430f741132a631527a8e0e6dff4e866be253d733 Mon Sep 17 00:00:00 2001 +From: Jakub Ruzicka +Date: Wed, 7 Aug 2013 19:35:08 +0200 +Subject: [PATCH] Remove runtime dependency on python-pbr. + +--- + novaclient/__init__.py | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/novaclient/__init__.py b/novaclient/__init__.py +index bfa7553..18e8783 100644 +--- a/novaclient/__init__.py ++++ b/novaclient/__init__.py +@@ -12,7 +12,4 @@ + # License for the specific language governing permissions and limitations + # under the License. + +-import pbr.version +- +- +-__version__ = pbr.version.VersionInfo('python-novaclient').version_string() ++__version__ = "REDHATNOVACLIENTVERSION" diff --git a/python-novaclient.spec b/python-novaclient.spec index 8e64103..3f7d2d5 100644 --- a/python-novaclient.spec +++ b/python-novaclient.spec @@ -1,7 +1,7 @@ Name: python-novaclient Epoch: 1 -Version: 2.13.0 -Release: 2%{?dist} +Version: 2.14.1 +Release: 1%{?dist} Summary: Python API and CLI for OpenStack Nova Group: Development/Languages @@ -9,15 +9,24 @@ License: ASL 2.0 URL: http://pypi.python.org/pypi/%{name} Source0: http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz + +# +# patches_base=2.14.1 +# +Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch + BuildArch: noarch BuildRequires: python-setuptools BuildRequires: python2-devel +BuildRequires: python-d2to1 +BuildRequires: python-pbr Requires: python-argparse Requires: python-iso8601 Requires: python-prettytable -Requires: python-requests >= 0.8 +Requires: python-requests Requires: python-simplejson +Requires: python-six Requires: python-keyring Requires: python-setuptools @@ -42,27 +51,38 @@ This package contains auto-generated documentation. %prep %setup -q +%patch0001 -p1 + +# We provide version like this in order to remove runtime dep on pbr. +sed -i s/REDHATNOVACLIENTVERSION/%{version}/ novaclient/__init__.py + # Remove bundled egg-info rm -rf python_novaclient.egg-info # let RPM handle deps # TODO: Have the following handle multi line entries sed -i '/setup_requires/d; /install_requires/d; /dependency_links/d' setup.py +# Remove the requirements files so that pbr hooks don't add them +# to distutils requiers_dist config. +rm -rf {test-,}requirements.txt tools/{pip,test}-requires + %build %{__python} setup.py build %install %{__python} setup.py install -O1 --skip-build --root %{buildroot} -echo "%{version}" > %{buildroot}%{python_sitelib}/novaclient/versioninfo mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d -install -pm 644 tools/nova.bash_completion %{buildroot}%{_sysconfdir}/bash_completion.d/nova +install -pm 644 tools/nova.bash_completion \ + %{buildroot}%{_sysconfdir}/bash_completion.d/nova # Delete tests -rm -fr %{buildroot}%{python_sitelib}/tests - +rm -fr %{buildroot}%{python_sitelib}/novaclient/tests export PYTHONPATH="$( pwd ):$PYTHONPATH" sphinx-build -b html doc/source html +sphinx-build -b man doc/source man + +install -p -D -m 644 man/nova.1 %{buildroot}%{_mandir}/man1/nova.1 # Fix hidden-file-or-dir warnings rm -fr html/.doctrees html/.buildinfo @@ -74,11 +94,19 @@ rm -fr html/.doctrees html/.buildinfo %{python_sitelib}/novaclient %{python_sitelib}/*.egg-info %{_sysconfdir}/bash_completion.d +%{_mandir}/man1/nova.1.gz %files doc %doc html %changelog +* Wed Aug 07 2013 Jakub Ruzicka - 1:2.14.1-1 +- Update to upstream version 2.14.1. +- New build requires: python-d2to1, python-pbr +- New require: python-six +- Remove runtime dependency on python-pbr. +- Include new manpage. + * Sun Aug 04 2013 Fedora Release Engineering - 1:2.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index e27fb87..1a86e07 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1079ade7e1956c8ea0613ca7910ab54 python-novaclient-2.13.0.tar.gz +9890462a57c8388f5f38e179a1953fe5 python-novaclient-2.14.1.tar.gz