[python-keystoneclient/el6-havana] Update to upstream 0.6.0
Jakub Ruzicka
jruzicka at fedoraproject.org
Wed Mar 12 12:34:34 UTC 2014
commit e07854c94859fba37210c862a5324ca636f944ca
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date: Tue Mar 11 20:52:22 2014 +0100
Update to upstream 0.6.0
Changelog:
- Update to upstream 0.6.0
- Align doc build with other client packages
- Put bash completion in /etc/bash_completion.d (optional bash-completion)
.gitignore | 1 +
0001-Remove-runtime-dependency-on-python-pbr.patch | 54 +++------------
...ent-requires-an-email-address-when-creati.patch | 75 --------------------
python-keystoneclient.spec | 38 +++++-----
sources | 2 +-
5 files changed, 29 insertions(+), 141 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 129c80d..2d3c293 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/python-keystoneclient-0.3.1.tar.gz
/python-keystoneclient-0.3.2.tar.gz
/python-keystoneclient-0.4.1.tar.gz
+/python-keystoneclient-0.6.0.tar.gz
diff --git a/0001-Remove-runtime-dependency-on-python-pbr.patch b/0001-Remove-runtime-dependency-on-python-pbr.patch
index f8e0809..e6d86f4 100644
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ b/0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -1,22 +1,18 @@
-From 9b806dc97da51f93d9eb258969b5660c88904f62 Mon Sep 17 00:00:00 2001
+From 87d0080f3e7111e8a016025bcf2c880538c0a2a1 Mon Sep 17 00:00:00 2001
From: Jakub Ruzicka <jruzicka at redhat.com>
Date: Mon, 8 Jul 2013 15:22:05 +0200
Subject: [PATCH] Remove runtime dependency on python-pbr.
---
- keystoneclient/__init__.py | 5 +----
- requirements.txt | 10 ----------
- setup.py | 1 -
- test-requirements.txt | 13 -------------
- 4 files changed, 1 insertion(+), 28 deletions(-)
- delete mode 100644 requirements.txt
- delete mode 100644 test-requirements.txt
+ keystoneclient/__init__.py | 5 +----
+ setup.py | 1 -
+ 2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/keystoneclient/__init__.py b/keystoneclient/__init__.py
-index 07aaa70..c5fb9ed 100644
+index ab4f7a1..f735877 100644
--- a/keystoneclient/__init__.py
+++ b/keystoneclient/__init__.py
-@@ -13,7 +13,4 @@
+@@ -13,10 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
@@ -25,22 +21,9 @@ index 07aaa70..c5fb9ed 100644
-
-__version__ = pbr.version.VersionInfo('python-keystoneclient').version_string()
+__version__ = "REDHATKEYSTONECLIENTVERSION"
-diff --git a/requirements.txt b/requirements.txt
-deleted file mode 100644
-index 8533bde..0000000
---- a/requirements.txt
-+++ /dev/null
-@@ -1,10 +0,0 @@
--pbr>=0.5.21,<1.0
--argparse
--iso8601>=0.1.4
--PrettyTable>=0.6,<0.8
--requests>=1.1
--simplejson>=2.0.9
--six>=1.4.1
--oslo.config>=1.2.0
--netaddr
--Babel>=1.3
+
+ __all__ = [
+ # Modules
diff --git a/setup.py b/setup.py
index 70c2b3f..afab729 100644
--- a/setup.py
@@ -51,22 +34,3 @@ index 70c2b3f..afab729 100644
setuptools.setup(
- setup_requires=['pbr'],
pbr=True)
-diff --git a/test-requirements.txt b/test-requirements.txt
-deleted file mode 100644
-index 9cefe29..0000000
---- a/test-requirements.txt
-+++ /dev/null
-@@ -1,13 +0,0 @@
--hacking>=0.5.6,<0.8
--coverage>=3.6
--discover
--fixtures>=0.3.14
--httpretty>=0.6.3
--keyring>=1.6.1,<2.0
--mock>=1.0
--mox3>=0.7.0
--pycrypto>=2.6
--sphinx>=1.1.2
--testrepository>=0.0.17
--testtools>=0.9.32
--WebOb>=1.2.3,<1.3
diff --git a/python-keystoneclient.spec b/python-keystoneclient.spec
index 871837f..7354398 100644
--- a/python-keystoneclient.spec
+++ b/python-keystoneclient.spec
@@ -3,18 +3,17 @@ Name: python-keystoneclient
# and restarted version numbering from 0.1.1
# https://lists.launchpad.net/openstack/msg14248.html
Epoch: 1
-Version: 0.4.1
-Release: 4%{?dist}
+Version: 0.6.0
+Release: 1%{?dist}
Summary: Client library for OpenStack Identity API
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=0.4.1
+# patches_base=0.6.0
#
Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
-Patch0002: 0002-keystoneclient-requires-an-email-address-when-creati.patch
BuildArch: noarch
@@ -55,11 +54,13 @@ Identity API.
%setup -q
%patch0001 -p1
-%patch0002 -p1
# We provide version like this in order to remove runtime dep on pbr.
sed -i s/REDHATKEYSTONECLIENTVERSION/%{version}/ keystoneclient/__init__.py
+# Let RPM handle the dependencies
+rm -f test-requirements.txt requirements.txt
+
# Remove bundled egg-info
rm -rf python_keystoneclient.egg-info
@@ -68,41 +69,38 @@ rm -rf python_keystoneclient.egg-info
%install
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-# rhbz 888939#c7: bash-completion is not in RHEL
-mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-install -pm 644 tools/keystone.bash_completion %{buildroot}%{_sysconfdir}/profile.d/keystone.sh
+install -p -D -m 644 tools/keystone.bash_completion \
+ %{buildroot}%{_sysconfdir}/bash_completion.d/keystone.bash_completion
# Delete tests
rm -fr %{buildroot}%{python_sitelib}/tests
-# Build HTML docs
+# Build HTML docs and man page
export PYTHONPATH="$( pwd ):$PYTHONPATH"
-pushd doc
-if [ -x /usr/bin/sphinx-apidoc ]; then
- make html
-else
- make html SPHINXAPIDOC=echo SPHINXBUILD=sphinx-1.0-build
-fi
-popd
-# Build man page
+sphinx-1.0-build -b html doc/source html
sphinx-1.0-build -b man doc/source man
install -p -D -m 644 man/keystone.1 %{buildroot}%{_mandir}/man1/keystone.1
# Fix hidden-file-or-dir warnings
-rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
+rm -fr html/.doctrees html/.buildinfo
%files
%doc LICENSE README.rst
%{_bindir}/keystone
-%{_sysconfdir}/profile.d/keystone.sh
+%{_sysconfdir}/bash_completion.d/keystone.bash_completion
%{python_sitelib}/keystoneclient
%{python_sitelib}/*.egg-info
%{_mandir}/man1/keystone.1*
%files doc
-%doc LICENSE doc/build/html
+%doc LICENSE html
%changelog
+* Tue Mar 11 2014 Jakub Ruzicka <jruzicka at redhat.com> 1:0.6.0-1
+- Update to upstream 0.6.0
+- Align doc build with other client packages
+- Put bash completion in /etc/bash_completion.d (optional bash-completion)
+
* Fri Jan 03 2014 Jakub Ruzicka <jruzicka at redhat.com> 0.4.1-4
- Don't require an email address when creating a user
- Put bash completion in /etc/profile.d (rhbz#1024581)
diff --git a/sources b/sources
index e05b87d..e661e7b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c1ce69c637c86f080b59a6e8e3afb243 python-keystoneclient-0.4.1.tar.gz
+1d469504058e47205023e6aebe4bb150 python-keystoneclient-0.6.0.tar.gz
More information about the scm-commits
mailing list