[python-swiftclient] Update to upstream 1.6.0.

[Jakub Ruzicka]

commit 74b6ff30d3329ec62a218941d31a50c5930ec15c
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Sun Sep 1 18:11:13 2013 +0200

    Update to upstream 1.6.0.

 .gitignore                                         |    1 +
 0001-Remove-runtime-dependency-on-python-pbr.patch |   46 +++++++++++++++++++-
 python-swiftclient.spec                            |   18 +++++---
 sources                                            |    2 +-
 4 files changed, 58 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2ac3b69..7a278ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /python-swiftclient-1.3.0.tar.gz
 /python-swiftclient-1.4.0.tar.gz
 /python-swiftclient-1.5.0.tar.gz
+/python-swiftclient-1.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 0795676..97c61d1 100644
--- a/0001-Remove-runtime-dependency-on-python-pbr.patch
+++ b/0001-Remove-runtime-dependency-on-python-pbr.patch
@@ -1,12 +1,36 @@
-From af09bae37223f4c6e990f5e3badee502229ca101 Mon Sep 17 00:00:00 2001
+From 7a03cf04a8960346fa88ea9fe5fd3ba67dc036a7 Mon Sep 17 00:00:00 2001
 From: Jakub Ruzicka <jruzicka at redhat.com>
 Date: Tue, 23 Jul 2013 16:28:21 +0200
 Subject: [PATCH] Remove runtime dependency on python-pbr.
 
 ---
+ requirements.txt       |  3 ---
+ setup.py               |  1 -
  swiftclient/version.py | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
+ test-requirements.txt  | 12 ------------
+ 4 files changed, 15 insertions(+), 18 deletions(-)
+ delete mode 100644 requirements.txt
+ delete mode 100644 test-requirements.txt
 
+diff --git a/requirements.txt b/requirements.txt
+deleted file mode 100644
+index 21115e0..0000000
+--- a/requirements.txt
++++ /dev/null
+@@ -1,3 +0,0 @@
+-d2to1>=0.2.10,<0.3
+-pbr>=0.5,<0.6
+-simplejson>=2.0.9
+diff --git a/setup.py b/setup.py
+index 59a0090..990f50d 100644
+--- a/setup.py
++++ b/setup.py
+@@ -17,5 +17,4 @@
+ import setuptools
+ 
+ setuptools.setup(
+-    setup_requires=['d2to1', 'pbr'],
+     d2to1=True)
 diff --git a/swiftclient/version.py b/swiftclient/version.py
 index 7bb5d18..bb908b8 100644
 --- a/swiftclient/version.py
@@ -33,3 +57,21 @@ index 7bb5d18..bb908b8 100644
 +        return "%s%s" % (prefix, self.version)
 +
 +version_info = VersionInfo()
+diff --git a/test-requirements.txt b/test-requirements.txt
+deleted file mode 100644
+index 223dcf4..0000000
+--- a/test-requirements.txt
++++ /dev/null
+@@ -1,12 +0,0 @@
+-# Install bounded pep8/pyflakes first, then let flake8 install
+-pep8==1.4.5
+-pyflakes==0.7.2
+-flake8==2.0
+-
+-coverage
+-discover
+-mock>=0.8.0
+-python-keystoneclient
+-sphinx>=1.1.2
+-testrepository>=0.0.13
+-testtools>=0.9.22
diff --git a/python-swiftclient.spec b/python-swiftclient.spec
index ac88f50..5e84927 100644
--- a/python-swiftclient.spec
+++ b/python-swiftclient.spec
@@ -1,13 +1,13 @@
 Name:       python-swiftclient
-Version:    1.5.0
-Release:    2%{?dist}
+Version:    1.6.0
+Release:    1%{?dist}
 Summary:    Client Library for OpenStack Object Storage 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=1.5.0
+# patches_base=1.6.0
 #
 Patch0001: 0001-Remove-runtime-dependency-on-python-pbr.patch
 
@@ -45,9 +45,6 @@ sed -i s/REDHATSWIFTCLIENTVERSION/%{version}/ swiftclient/version.py
 
 # Remove bundled egg-info
 rm -rf python_swiftclient.egg-info
-# let RPM handle deps
-: > requirements.txt
-: > test-requirements.txt
 
 %build
 %{__python} setup.py build
@@ -59,6 +56,9 @@ export PYTHONPATH="$( pwd ):$PYTHONPATH"
 pushd doc
 make html
 popd
+
+install -p -D -m 644 doc/manpages/swift.1 %{buildroot}%{_mandir}/man1/swift.1
+
 # Fix hidden-file-or-dir warnings
 rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
 
@@ -67,11 +67,17 @@ rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
 %{_bindir}/swift
 %{python_sitelib}/swiftclient
 %{python_sitelib}/*.egg-info
+%{_mandir}/man1/swift.1*
 
 %files doc
 %doc LICENSE doc/build/html
 
 %changelog
+* Mon Sep 02 2013 Jakub Ruzicka <jruzicka at redhat.com> - 1.6.0-1
+- Update to upstream 1.6.0.
+- Include man page.
+- Remove all pbr deps in the patch instead of this spec file.
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 99b8aff..7bfe5bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-717ade4e91c0f5372f6fa6d545e7bab7  python-swiftclient-1.5.0.tar.gz
+9713c1d1aa80e8052027c22fd40607ac  python-swiftclient-1.6.0.tar.gz