diff --git a/.gitignore b/.gitignore index 6da4b4a..0ecda99 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /python-openstackclient-0.2.2.tar.gz /python-openstackclient-0.3.0.tar.gz +/python-openstackclient-0.3.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..7851179 --- /dev/null +++ b/0001-Remove-runtime-dependency-on-python-pbr.patch @@ -0,0 +1,42 @@ +From b4b3973644242b7e5ea5ef9eb2ab3a5a464653f1 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 + +Also remove pbr/pkg_resources requirements handling. + +ERROR: openstackclient.shell Exception raised: \ + (pycrypto 2.0.1 (/usr/lib64/python2.6/site-packages), Requirement.parse('pycrypto>=2.6')) + +DO NOT WANT +--- + openstackclient/__init__.py | 8 +------- + setup.py | 1 - + 2 files changed, 1 insertion(+), 8 deletions(-) + +diff --git a/openstackclient/__init__.py b/openstackclient/__init__.py +index 89deee3..b55482b 100644 +--- a/openstackclient/__init__.py ++++ b/openstackclient/__init__.py +@@ -13,10 +13,4 @@ + + __all__ = ['__version__'] + +-import pbr.version +- +-version_info = pbr.version.VersionInfo('python-openstackclient') +-try: +- __version__ = version_info.version_string() +-except AttributeError: +- __version__ = None ++__version__ = 'REDHATOPENSTACKCLIENTVERSION' +diff --git a/setup.py b/setup.py +index 70c2b3f..afab729 100644 +--- a/setup.py ++++ b/setup.py +@@ -18,5 +18,4 @@ + import setuptools + + setuptools.setup( +- setup_requires=['pbr'], + pbr=True) diff --git a/python-openstackclient.spec b/python-openstackclient.spec index 0bf0571..f6b919e 100644 --- a/python-openstackclient.spec +++ b/python-openstackclient.spec @@ -1,5 +1,5 @@ Name: python-openstackclient -Version: 0.3.0 +Version: 0.3.1 Release: 1%{?dist} Summary: OpenStack Command-line Client @@ -9,8 +9,9 @@ URL: http://github.com/openstack/python-openstackclient Source0: http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz # -# patches_base=0.3.0+1 +# patches_base=0.3.1+1 # +Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch BuildArch: noarch @@ -55,6 +56,7 @@ This package contains auto-generated documentation. %prep %setup -q +%patch0001 -p1 # Remove bundled egg-info rm -rf python_openstackclient.egg-info @@ -91,6 +93,10 @@ rm -fr html/.doctrees html/.buildinfo %doc html %changelog +* Tue Apr 08 2014 Jakub Ruzicka 0.3.1-1 +- Update to upstream 0.3.1 +- Remove runtime dependency on python-pbr + * Wed Jan 08 2014 Jakub Ruzicka 0.3.0-1 - Update to upstream 0.3.0 - New dependencies: python-six, python-requests diff --git a/sources b/sources index 91005d2..1628bd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc0f86d23d706d3a36aba47398fad03b python-openstackclient-0.3.0.tar.gz +e3c2b0ef8539a583f767427de8a4bdf9 python-openstackclient-0.3.1.tar.gz