diff --git a/.gitignore b/.gitignore index 0ecda99..cb8a465 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /python-openstackclient-0.2.2.tar.gz /python-openstackclient-0.3.0.tar.gz /python-openstackclient-0.3.1.tar.gz +/python-openstackclient-0.4.1.tar.gz diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch index 7851179..bcbb165 100644 --- a/0001-Remove-runtime-dependency-on-python-pbr.patch +++ b/0001-Remove-runtime-dependency-on-python-pbr.patch @@ -1,4 +1,4 @@ -From b4b3973644242b7e5ea5ef9eb2ab3a5a464653f1 Mon Sep 17 00:00:00 2001 +From cfcffd45bc00a1d1ca76695d15f5ccdac2b67249 Mon Sep 17 00:00:00 2001 From: Jakub Ruzicka Date: Tue, 8 Apr 2014 15:50:33 +0200 Subject: [PATCH] Remove runtime dependency on python-pbr @@ -31,11 +31,11 @@ index 89deee3..b55482b 100644 - __version__ = None +__version__ = 'REDHATOPENSTACKCLIENTVERSION' diff --git a/setup.py b/setup.py -index 70c2b3f..afab729 100644 +index 7363757..09230a0 100644 --- a/setup.py +++ b/setup.py -@@ -18,5 +18,4 @@ - import setuptools +@@ -26,5 +26,4 @@ except ImportError: + pass setuptools.setup( - setup_requires=['pbr'], diff --git a/python-openstackclient.spec b/python-openstackclient.spec index 92c8ada..69e3497 100644 --- a/python-openstackclient.spec +++ b/python-openstackclient.spec @@ -1,6 +1,6 @@ Name: python-openstackclient -Version: 0.3.1 -Release: 3%{?dist} +Version: 0.4.1 +Release: 1%{?dist} Summary: OpenStack Command-line Client Group: Development/Languages @@ -8,9 +8,6 @@ License: ASL 2.0 URL: http://github.com/openstack/python-openstackclient Source0: http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz -# -# patches_base=0.3.1+1 -# Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch BuildArch: noarch @@ -19,17 +16,17 @@ BuildRequires: python2-devel BuildRequires: python-setuptools BuildRequires: python-pbr BuildRequires: python-d2to1 -BuildRequires: python-sphinx +BuildRequires: python-oslo-sphinx BuildRequires: git Requires: python-pbr Requires: python-cliff -Requires: python-keyring Requires: python-crypto Requires: python-glanceclient Requires: python-keystoneclient Requires: python-novaclient Requires: python-cinderclient +Requires: python-neutronclient Requires: python-six Requires: python-requests @@ -75,6 +72,8 @@ rm -rf requirements.txt test-requirements.txt # Remove bundled egg-info rm -rf python_openstackclient.egg-info +sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py + %build %{__python2} setup.py build @@ -104,6 +103,12 @@ rm -fr html/.doctrees html/.buildinfo %doc html %changelog +* Fri Sep 26 2014 Jakub Ruzicka 0.4.1-1 +- Update to upstream 0.4.1 +- New Requires: python-neutronclient, python-oslo-sphinx +- Removed Requires: python-keyring, python-sphinx +- oslosphinx -> oslo.sphinx + * Sat Jun 07 2014 Fedora Release Engineering - 0.3.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 1628bd4..3de0b12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3c2b0ef8539a583f767427de8a4bdf9 python-openstackclient-0.3.1.tar.gz +433221537ed56520cade3a732a06d555 python-openstackclient-0.4.1.tar.gz