[python-keystoneclient] Remove runtime dependency on python-pbr.
Jakub Ruzicka
jruzicka at fedoraproject.org
Tue Jun 25 20:07:05 UTC 2013
commit ae8b6031a3be28d34726f9a6748f93124c6c56dc
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date: Tue Jun 25 21:51:12 2013 +0200
Remove runtime dependency on python-pbr.
0001-Remove-runtime-dependency-on-python-pbr.patch | 22 ++++++++++++++
...ch => 0002-Add-find-method-to-CrudManager.patch | 2 +-
...oneclient-to-work-with-older-keystone-ins.patch | 2 +-
...l-keyring-support-add-basic-keyring-tests.patch | 2 +-
...0005-Cleanup-shell-s-authentication-check.patch | 2 +-
...tch => 0006-Provide-keystone-CLI-man-page.patch | 2 +-
...> 0007-Use-AuthRef-for-some-client-fields.patch | 2 +-
...> 0008-Fix-memcache-encryption-middleware.patch | 2 +-
...ache-config-entry-name-in-Keystone-to-be-.patch | 2 +-
...t.patch => 0010-Implements-v3-auth-client.patch | 2 +-
...6-compatibility-for-tests-test_keyring.py.patch | 2 +-
python-keystoneclient.spec | 31 ++++++++++++-------
12 files changed, 51 insertions(+), 22 deletions(-)
---
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..6efd054
--- /dev/null
+++ b/0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -0,0 +1,22 @@
+From 2491997eb7909b94942172dfae48b20c7a0bba1c Mon Sep 17 00:00:00 2001
+From: Jakub Ruzicka <jruzicka at redhat.com>
+Date: Tue, 25 Jun 2013 21:40:33 +0200
+Subject: [PATCH] Remove runtime dependency on python-pbr.
+
+---
+ keystoneclient/__init__.py | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/keystoneclient/__init__.py b/keystoneclient/__init__.py
+index d13c009..0fb852f 100644
+--- a/keystoneclient/__init__.py
++++ b/keystoneclient/__init__.py
+@@ -13,7 +13,4 @@
+ # License for the specific language governing permissions and limitations
+ # under the License.
+
+-import pbr.version
+-
+-
+-__version__ = pbr.version.VersionInfo('python-keystoneclient').version_string()
++__version__ = "REDHATKEYSTONECLIENTVERSION"
diff --git a/0001-Add-find-method-to-CrudManager.patch b/0002-Add-find-method-to-CrudManager.patch
similarity index 97%
rename from 0001-Add-find-method-to-CrudManager.patch
rename to 0002-Add-find-method-to-CrudManager.patch
index fd47f8d..60d5c4c 100644
--- a/0001-Add-find-method-to-CrudManager.patch
+++ b/0002-Add-find-method-to-CrudManager.patch
@@ -1,4 +1,4 @@
-From e2b8178481e7da1f6f90135e0e0953e4f0c1eec0 Mon Sep 17 00:00:00 2001
+From 38d02e746b0f298711bb98c7f7c83ea1dd345d83 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer at gmail.com>
Date: Fri, 5 Apr 2013 17:36:32 -0500
Subject: [PATCH] Add find() method to CrudManager
diff --git a/0002-Allow-keystoneclient-to-work-with-older-keystone-ins.patch b/0003-Allow-keystoneclient-to-work-with-older-keystone-ins.patch
similarity index 95%
rename from 0002-Allow-keystoneclient-to-work-with-older-keystone-ins.patch
rename to 0003-Allow-keystoneclient-to-work-with-older-keystone-ins.patch
index b044ee9..196737e 100644
--- a/0002-Allow-keystoneclient-to-work-with-older-keystone-ins.patch
+++ b/0003-Allow-keystoneclient-to-work-with-older-keystone-ins.patch
@@ -1,4 +1,4 @@
-From 35f9e9922a388b1600c947a27f80c94cb76800dc Mon Sep 17 00:00:00 2001
+From ac6ef02a19bf303772860429af693261b461e32a Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar at rackspace.com>
Date: Mon, 25 Mar 2013 13:19:26 -0400
Subject: [PATCH] Allow keystoneclient to work with older keystone installs
diff --git a/0003-Fix-optional-keyring-support-add-basic-keyring-tests.patch b/0004-Fix-optional-keyring-support-add-basic-keyring-tests.patch
similarity index 99%
rename from 0003-Fix-optional-keyring-support-add-basic-keyring-tests.patch
rename to 0004-Fix-optional-keyring-support-add-basic-keyring-tests.patch
index fc7623b..6539493 100644
--- a/0003-Fix-optional-keyring-support-add-basic-keyring-tests.patch
+++ b/0004-Fix-optional-keyring-support-add-basic-keyring-tests.patch
@@ -1,4 +1,4 @@
-From 791be2ded37a05ddbabb6c5da5e7378943bad4d6 Mon Sep 17 00:00:00 2001
+From 0ce86bcf74108ef63282321efa70c8de03594a04 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten at redhat.com>
Date: Wed, 22 May 2013 17:00:53 -0400
Subject: [PATCH] Fix optional keyring support, add basic keyring tests
diff --git a/0004-Cleanup-shell-s-authentication-check.patch b/0005-Cleanup-shell-s-authentication-check.patch
similarity index 99%
rename from 0004-Cleanup-shell-s-authentication-check.patch
rename to 0005-Cleanup-shell-s-authentication-check.patch
index a3f1678..b98e2d7 100644
--- a/0004-Cleanup-shell-s-authentication-check.patch
+++ b/0005-Cleanup-shell-s-authentication-check.patch
@@ -1,4 +1,4 @@
-From ad904e2b5bac76a8281ec3befff19fa558ca941e Mon Sep 17 00:00:00 2001
+From 7c53803947f14b613635e33b48643d7fcbb59dfb Mon Sep 17 00:00:00 2001
From: Jamie Lennox <jlennox at redhat.com>
Date: Tue, 4 Jun 2013 11:16:09 +1000
Subject: [PATCH] Cleanup shell's authentication check.
diff --git a/0005-Provide-keystone-CLI-man-page.patch b/0006-Provide-keystone-CLI-man-page.patch
similarity index 99%
rename from 0005-Provide-keystone-CLI-man-page.patch
rename to 0006-Provide-keystone-CLI-man-page.patch
index 0943c7d..696cf10 100644
--- a/0005-Provide-keystone-CLI-man-page.patch
+++ b/0006-Provide-keystone-CLI-man-page.patch
@@ -1,4 +1,4 @@
-From feefba304cd05b3a40d0e7520bc14c35e25f5e93 Mon Sep 17 00:00:00 2001
+From 5638037b1879eb4a6a5f70d097c3351118441994 Mon Sep 17 00:00:00 2001
From: Jakub Ruzicka <jruzicka at redhat.com>
Date: Tue, 28 May 2013 20:37:43 +0200
Subject: [PATCH] Provide keystone CLI man page.
diff --git a/0006-Use-AuthRef-for-some-client-fields.patch b/0007-Use-AuthRef-for-some-client-fields.patch
similarity index 98%
rename from 0006-Use-AuthRef-for-some-client-fields.patch
rename to 0007-Use-AuthRef-for-some-client-fields.patch
index 03a5647..257356c 100644
--- a/0006-Use-AuthRef-for-some-client-fields.patch
+++ b/0007-Use-AuthRef-for-some-client-fields.patch
@@ -1,4 +1,4 @@
-From 31239b3c4c36689efb5ea62c568150a50beeb76a Mon Sep 17 00:00:00 2001
+From 0238c5225f654a22569162dc38c7f0415f687b0e Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien at danjou.info>
Date: Thu, 24 Jan 2013 17:46:29 +0100
Subject: [PATCH] Use AuthRef for some client fields
diff --git a/0007-Fix-memcache-encryption-middleware.patch b/0008-Fix-memcache-encryption-middleware.patch
similarity index 99%
rename from 0007-Fix-memcache-encryption-middleware.patch
rename to 0008-Fix-memcache-encryption-middleware.patch
index 34d5057..c58022f 100644
--- a/0007-Fix-memcache-encryption-middleware.patch
+++ b/0008-Fix-memcache-encryption-middleware.patch
@@ -1,4 +1,4 @@
-From e589458aadd36a96ebd09b2392b37cf381e55f47 Mon Sep 17 00:00:00 2001
+From 18336318011752ec9c47effcb03b02d7e425ec2d Mon Sep 17 00:00:00 2001
From: "Bryan D. Payne" <bdpayne at acm.org>
Date: Fri, 7 Jun 2013 09:34:25 -0700
Subject: [PATCH] Fix memcache encryption middleware
diff --git a/0008-Change-memcache-config-entry-name-in-Keystone-to-be-.patch b/0009-Change-memcache-config-entry-name-in-Keystone-to-be-.patch
similarity index 99%
rename from 0008-Change-memcache-config-entry-name-in-Keystone-to-be-.patch
rename to 0009-Change-memcache-config-entry-name-in-Keystone-to-be-.patch
index 2a5050d..128334e 100644
--- a/0008-Change-memcache-config-entry-name-in-Keystone-to-be-.patch
+++ b/0009-Change-memcache-config-entry-name-in-Keystone-to-be-.patch
@@ -1,4 +1,4 @@
-From 5653ce5a771eeedaf8f33ddec4750d067675eede Mon Sep 17 00:00:00 2001
+From 9cb5b58661b23a5d131dfdd3d52988c15f9fbcfd Mon Sep 17 00:00:00 2001
From: xingzhou <xingzhou at cn.ibm.com>
Date: Tue, 4 Jun 2013 01:44:09 -0400
Subject: [PATCH] Change memcache config entry name in Keystone to be
diff --git a/0009-Implements-v3-auth-client.patch b/0010-Implements-v3-auth-client.patch
similarity index 99%
rename from 0009-Implements-v3-auth-client.patch
rename to 0010-Implements-v3-auth-client.patch
index df2b3b5..761773d 100644
--- a/0009-Implements-v3-auth-client.patch
+++ b/0010-Implements-v3-auth-client.patch
@@ -1,4 +1,4 @@
-From 5fbca33595b43a027065e726cac04f530469567a Mon Sep 17 00:00:00 2001
+From fe3f74a4d6f31f63ecc4dd6cb22b9c56b1e588c7 Mon Sep 17 00:00:00 2001
From: lin-hua-cheng <lin-hua.cheng at hp.com>
Date: Wed, 13 Feb 2013 22:52:05 -0600
Subject: [PATCH] Implements v3 auth client.
diff --git a/0010-Python-2.6-compatibility-for-tests-test_keyring.py.patch b/0011-Python-2.6-compatibility-for-tests-test_keyring.py.patch
similarity index 95%
rename from 0010-Python-2.6-compatibility-for-tests-test_keyring.py.patch
rename to 0011-Python-2.6-compatibility-for-tests-test_keyring.py.patch
index fb54bbc..ea14f61 100644
--- a/0010-Python-2.6-compatibility-for-tests-test_keyring.py.patch
+++ b/0011-Python-2.6-compatibility-for-tests-test_keyring.py.patch
@@ -1,4 +1,4 @@
-From 974ec621dc56db7c464a1b3ce5f11d058dc2a5bc Mon Sep 17 00:00:00 2001
+From e3ac9df7f6188f0aa7ad6ed8bc891f562093bb15 Mon Sep 17 00:00:00 2001
From: Sascha Peilicke <saschpe at gmx.de>
Date: Mon, 17 Jun 2013 12:13:19 +0200
Subject: [PATCH] Python-2.6 compatibility for tests/test_keyring.py
diff --git a/python-keystoneclient.spec b/python-keystoneclient.spec
index 29c38a7..5ea7acc 100644
--- a/python-keystoneclient.spec
+++ b/python-keystoneclient.spec
@@ -4,7 +4,7 @@ Name: python-keystoneclient
# https://lists.launchpad.net/openstack/msg14248.html
Epoch: 1
Version: 0.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Client library for OpenStack Identity API
License: ASL 2.0
URL: http://pypi.python.org/pypi/%{name}
@@ -13,16 +13,17 @@ Source0: http://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.
#
# patches_base=0.2.5
#
-Patch0001: 0001-Add-find-method-to-CrudManager.patch
-Patch0002: 0002-Allow-keystoneclient-to-work-with-older-keystone-ins.patch
-Patch0003: 0003-Fix-optional-keyring-support-add-basic-keyring-tests.patch
-Patch0004: 0004-Cleanup-shell-s-authentication-check.patch
-Patch0005: 0005-Provide-keystone-CLI-man-page.patch
-Patch0006: 0006-Use-AuthRef-for-some-client-fields.patch
-Patch0007: 0007-Fix-memcache-encryption-middleware.patch
-Patch0008: 0008-Change-memcache-config-entry-name-in-Keystone-to-be-.patch
-Patch0009: 0009-Implements-v3-auth-client.patch
-Patch0010: 0010-Python-2.6-compatibility-for-tests-test_keyring.py.patch
+Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
+Patch0002: 0002-Add-find-method-to-CrudManager.patch
+Patch0003: 0003-Allow-keystoneclient-to-work-with-older-keystone-ins.patch
+Patch0004: 0004-Fix-optional-keyring-support-add-basic-keyring-tests.patch
+Patch0005: 0005-Cleanup-shell-s-authentication-check.patch
+Patch0006: 0006-Provide-keystone-CLI-man-page.patch
+Patch0007: 0007-Use-AuthRef-for-some-client-fields.patch
+Patch0008: 0008-Fix-memcache-encryption-middleware.patch
+Patch0009: 0009-Change-memcache-config-entry-name-in-Keystone-to-be-.patch
+Patch0010: 0010-Implements-v3-auth-client.patch
+Patch0011: 0011-Python-2.6-compatibility-for-tests-test_keyring.py.patch
BuildArch: noarch
@@ -39,7 +40,6 @@ Requires: python-requests >= 0.8.8
Requires: python-simplejson
Requires: python-oslo-config >= 1.1.0
Requires: python-d2to1
-Requires: python-pbr
Requires: python-six
# other requirements
Requires: python-setuptools
@@ -74,6 +74,10 @@ Identity API.
%patch0008 -p1
%patch0009 -p1
%patch0010 -p1
+%patch0011 -p1
+
+# We provide version like this in order to remove runtime dep on pbr.
+sed -i s/REDHATKEYSTONECLIENTVERSION/%{version}/ keystoneclient/__init__.py
# Remove bundled egg-info
rm -rf python_keystoneclient.egg-info
@@ -108,6 +112,9 @@ rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
%doc LICENSE doc/build/html
%changelog
+* Tue Jun 25 2013 Jakub Ruzicka <jruzicka at redhat.com> 0.2.5-2
+- Remove runtime dependency on python-pbr.
+
* Tue Jun 25 2013 Jakub Ruzicka <jruzicka at redhat.com> 0.2.5-1
- Update to latest upstream. (0.2.5 + patches)
- Add new python requires from requirements.txt. (d2to1, pbr, six)
More information about the scm-commits
mailing list