[python-openstackclient/el6-havana] Update to upstream 0.3.0

Jakub Ruzicka jruzicka at fedoraproject.org
Wed Jan 8 13:31:07 UTC 2014


commit 1df31951272e153110a2f677bfe8d4ac79906aa5
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Tue Jan 7 18:27:53 2014 +0100

    Update to upstream 0.3.0
    
    Changelog:
    - Update to upstream 0.3.0
    - New dependencies: python-six, python-requests
    - Restore compatibility with old EPEL python-keyring

 .gitignore                                         |    1 +
 0001-Add-to-clientmanager-tests.patch              |   59 -
 ...e-compatibility-with-older-python-keyring.patch |   23 +
 0002-Add-object-store-show-commands.patch          | 1052 -------
 0003-Updated-from-global-requirements.patch        |   37 -
 ...s-to-support-TLS-certificate-verification.patch |  187 --
 0005-Sync-oslo-incubator-for-py33-fixes.patch      |  387 ---
 0006-Updated-from-global-requirements.patch        |   20 -
 ...lookups-for-user-project-in-volume-create.patch |  531 ----
 0008-Updated-from-global-requirements.patch        |   34 -
 0009-Remove-httpretty-from-test-requirements.patch |   24 -
 ...-URL-for-global-hacking-doc-and-fix-typos.patch |   56 -
 0011-change-execute-to-run.patch                   |   75 -
 0012-Complete-basic-test-infrastructure.patch      | 3199 --------------------
 0013-Add-server-image-create-command.patch         |  269 --
 0014-Support-building-wheels-PEP-427.patch         |   28 -
 0015-Fix-typo.patch                                |   23 -
 python-openstackclient.spec                        |   44 +-
 sources                                            |    2 +-
 19 files changed, 37 insertions(+), 6014 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ca16ebd..6da4b4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /python-openstackclient-0.2.2.tar.gz
+/python-openstackclient-0.3.0.tar.gz
diff --git a/0001-Restore-compatibility-with-older-python-keyring.patch b/0001-Restore-compatibility-with-older-python-keyring.patch
new file mode 100644
index 0000000..b1ec835
--- /dev/null
+++ b/0001-Restore-compatibility-with-older-python-keyring.patch
@@ -0,0 +1,23 @@
+From d9b0ee15ee33d9ca1f3d00aff4b442e5d8b54619 Mon Sep 17 00:00:00 2001
+From: Jakub Ruzicka <jruzicka at redhat.com>
+Date: Wed, 8 Jan 2014 14:06:39 +0100
+Subject: [PATCH] Restore compatibility with older python-keyring
+
+EPEL provides python-keyring version 0.7 which requires old usage.
+---
+ openstackclient/common/openstackkeyring.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/openstackclient/common/openstackkeyring.py b/openstackclient/common/openstackkeyring.py
+index 34c994b..e7431e5 100644
+--- a/openstackclient/common/openstackkeyring.py
++++ b/openstackclient/common/openstackkeyring.py
+@@ -24,7 +24,7 @@ import os
+ KEYRING_FILE = os.path.join(os.path.expanduser('~'), '.openstack-keyring.cfg')
+ 
+ 
+-class OpenstackKeyring(keyring.backends.file.BaseKeyring):
++class OpenstackKeyring(keyring.backend.BasicFileKeyring):
+     """Openstack Keyring to store encrypted password."""
+     filename = KEYRING_FILE
+ 
diff --git a/python-openstackclient.spec b/python-openstackclient.spec
index 1f5dc2e..db3efc8 100644
--- a/python-openstackclient.spec
+++ b/python-openstackclient.spec
@@ -1,6 +1,6 @@
 Name:             python-openstackclient
-Version:          0.2.2
-Release:          4%{?dist}
+Version:          0.3.0
+Release:          1%{?dist}
 Summary:          OpenStack Command-line Client
 
 Group:            Development/Languages
@@ -9,23 +9,10 @@ URL:              http://github.com/openstack/python-openstackclient
 Source0:          http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 
 #
-# patches_base=0.2.2+1
+# patches_base=0.3.0
 #
-Patch0001: 0001-Add-to-clientmanager-tests.patch
-Patch0002: 0002-Add-object-store-show-commands.patch
-Patch0003: 0003-Updated-from-global-requirements.patch
-Patch0004: 0004-Add-options-to-support-TLS-certificate-verification.patch
-Patch0005: 0005-Sync-oslo-incubator-for-py33-fixes.patch
-Patch0006: 0006-Updated-from-global-requirements.patch
-Patch0007: 0007-Do-lookups-for-user-project-in-volume-create.patch
-Patch0008: 0008-Updated-from-global-requirements.patch
-Patch0009: 0009-Remove-httpretty-from-test-requirements.patch
-Patch0010: 0010-Update-URL-for-global-hacking-doc-and-fix-typos.patch
-Patch0011: 0011-change-execute-to-run.patch
-Patch0012: 0012-Complete-basic-test-infrastructure.patch
-Patch0013: 0013-Add-server-image-create-command.patch
-Patch0014: 0014-Support-building-wheels-PEP-427.patch
-Patch0015: 0015-Fix-typo.patch
+Patch0001: 0001-Restore-compatibility-with-older-python-keyring.patch
+
 BuildArch:        noarch
 
 BuildRequires:    python2-devel
@@ -42,6 +29,8 @@ Requires:         python-glanceclient
 Requires:         python-keystoneclient
 Requires:         python-novaclient
 Requires:         python-cinderclient
+Requires:         python-six
+Requires:         python-requests
 
 %description
 python-openstackclient is a unified command-line client for the OpenStack APIs.
@@ -68,20 +57,6 @@ This package contains auto-generated documentation.
 %setup -q
 
 %patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-%patch0006 -p1
-%patch0007 -p1
-%patch0008 -p1
-%patch0009 -p1
-%patch0010 -p1
-%patch0011 -p1
-%patch0012 -p1
-%patch0013 -p1
-%patch0014 -p1
-%patch0015 -p1
 
 # Remove bundled egg-info
 rm -rf python_openstackclient.egg-info
@@ -118,6 +93,11 @@ rm -fr html/.doctrees html/.buildinfo
 %doc html
 
 %changelog
+* Tue Jan 07 2014 Jakub Ruzicka <jruzicka at redhat.com> 0.3.0-1
+- Update to upstream 0.3.0
+- New dependencies: python-six, python-requests
+- Restore compatibility with old EPEL python-keyring
+
 * Fri Nov 22 2013 Jakub Ruzicka <jruzicka at redhat.com> 0.2.2-4
 - Update with patches from upstream master
 
diff --git a/sources b/sources
index 6ff9e11..91005d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5ad5f3ad0e84c83ec623265420de79d4  python-openstackclient-0.2.2.tar.gz
+bc0f86d23d706d3a36aba47398fad03b  python-openstackclient-0.3.0.tar.gz


More information about the scm-commits mailing list