[python-swiftclient] Update to upstream 2.0.2

[Jakub Ruzicka]

commit 828ffe8bb94e9ac35eef48ebeec632296ede8cc7
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Thu Feb 27 17:07:36 2014 +0100

    Update to upstream 2.0.2
    
    Changelog:
    - Update to upstream 2.0.2
    - Switch from pyOpenSSL to python-requests - update dependencies
    - Remove unneeded dependency: python-simplejson

 .gitignore                                         |    1 +
 0001-Remove-builtin-requirements-handling.patch    |   32 +-
 ...d-SSL-certificate-verification-by-default.patch |  866 --------------------
 python-swiftclient.spec                            |   21 +-
 sources                                            |    2 +-
 5 files changed, 18 insertions(+), 904 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fecfadd..3094f87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /python-swiftclient-1.6.0.tar.gz
 /python-swiftclient-1.7.0.tar.gz
 /python-swiftclient-1.8.0.tar.gz
+/python-swiftclient-2.0.2.tar.gz
diff --git a/0001-Remove-builtin-requirements-handling.patch b/0001-Remove-builtin-requirements-handling.patch
index a28f2c5..4920e46 100644
--- a/0001-Remove-builtin-requirements-handling.patch
+++ b/0001-Remove-builtin-requirements-handling.patch
@@ -1,23 +1,12 @@
-From 49f2f86b4852d4c4e7fcb1877f051cae490c0fc9 Mon Sep 17 00:00:00 2001
+From 68b2c1e25bbfe52bc64a0e521f89d1deaa43a282 Mon Sep 17 00:00:00 2001
 From: Jakub Ruzicka <jruzicka at redhat.com>
 Date: Fri, 6 Dec 2013 17:36:12 +0100
 Subject: [PATCH] Remove builtin requirements handling
 
 ---
- requirements.txt      | 1 -
- setup.py              | 1 -
- test-requirements.txt | 9 ---------
- 3 files changed, 11 deletions(-)
- delete mode 100644 requirements.txt
- delete mode 100644 test-requirements.txt
+ setup.py | 1 -
+ 1 file changed, 1 deletion(-)
 
-diff --git a/requirements.txt b/requirements.txt
-deleted file mode 100644
-index 519b048..0000000
---- a/requirements.txt
-+++ /dev/null
-@@ -1 +0,0 @@
--simplejson>=2.0.9
 diff --git a/setup.py b/setup.py
 index 70c2b3f..afab729 100644
 --- a/setup.py
@@ -28,18 +17,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 5b78b5f..0000000
---- a/test-requirements.txt
-+++ /dev/null
-@@ -1,9 +0,0 @@
--hacking>=0.5.6,<0.8
--
--coverage>=3.6
--discover
--mock>=1.0
--python-keystoneclient>=0.3.2
--sphinx>=1.1.2
--testrepository>=0.0.17
--testtools>=0.9.32
diff --git a/python-swiftclient.spec b/python-swiftclient.spec
index 938e57d..927ca57 100644
--- a/python-swiftclient.spec
+++ b/python-swiftclient.spec
@@ -1,21 +1,19 @@
 Name:       python-swiftclient
-Version:    1.8.0
-Release:    2%{?dist}
+Version:    2.0.2
+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.8.0
+# patches_base=2.0.2
 #
 Patch0001: 0001-Remove-builtin-requirements-handling.patch
-Patch0002: 0002-Add-SSL-certificate-verification-by-default.patch
 
 BuildArch:  noarch
-Requires:   python-simplejson
 Requires:   python-keystoneclient
-Requires:   pyOpenSSL >= 0.12
+Requires:   python-requests
 # /usr/bin/swift collision with older swift-im rhbz#857900
 Conflicts:  swift < 2.0-0.3
 
@@ -23,7 +21,7 @@ BuildRequires: python2-devel
 BuildRequires: python-setuptools
 BuildRequires: python-d2to1
 BuildRequires: python-pbr
-BuildRequires: pyOpenSSL
+BuildRequires: python-requests
 
 %description
 Client library and command line utility for interacting with Openstack
@@ -43,7 +41,9 @@ Object Storage API.
 %setup -q
 
 %patch0001 -p1
-%patch0002 -p1
+
+# Let RPM handle the dependencies
+rm -f test-requirements.txt requirements.txt
 
 # Remove bundled egg-info
 rm -rf python_swiftclient.egg-info
@@ -75,6 +75,11 @@ rm -fr doc/build/html/.doctrees doc/build/html/.buildinfo
 %doc LICENSE doc/build/html
 
 %changelog
+* Thu Feb 27 2014 Jakub Ruzicka <jruzicka at redhat.com> 2.0.2-1
+- Update to upstream 2.0.2
+- Switch from pyOpenSSL to python-requests - update dependencies
+- Remove unneeded dependency: python-simplejson
+
 * Tue Feb 11 2014 Pete Zaitcev <zaitcev at redhat.com> 1.8.0-2
 - Fix the fix for CVE-2013-6395: EBADF, wildcards
 
diff --git a/sources b/sources
index 8c87381..d9a347e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f7be5a72f3590d20cf2706d86486927  python-swiftclient-1.8.0.tar.gz
+428789cea9ad3bf1a01e86e150d2ae03  python-swiftclient-2.0.2.tar.gz