From afa9e853425e01dae0afea8180bf8024cedb45de8c718b57f78f50d530e313c5 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Fri, 14 Aug 2015 12:46:47 +0000
Subject: [PATCH] Accepting request 322475 from devel:languages:python

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/322475
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-botocore?expand=0&rev=9
---
 botocore-1.0.0a3.tar.gz |  3 ---
 botocore-1.1.6.tar.gz   |  3 +++
 hide_py_pckgmgmt.patch  | 36 ++++++++++++++++++++++++++----------
 python-botocore.changes |  9 +++++++++
 python-botocore.spec    |  5 +++--
 5 files changed, 41 insertions(+), 15 deletions(-)
 delete mode 100644 botocore-1.0.0a3.tar.gz
 create mode 100644 botocore-1.1.6.tar.gz

diff --git a/botocore-1.0.0a3.tar.gz b/botocore-1.0.0a3.tar.gz
deleted file mode 100644
index 31ce103..0000000
--- a/botocore-1.0.0a3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:422e4ae625134b80e34be4e5abc0992ed8ae41f9086f8d403e4b9fed665a058e
-size 1600435
diff --git a/botocore-1.1.6.tar.gz b/botocore-1.1.6.tar.gz
new file mode 100644
index 0000000..8dc6d56
--- /dev/null
+++ b/botocore-1.1.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a456fd7fc4c984855a147a72e044575766e0bb7171669627f16bc30617be112c
+size 1699662
diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch
index 6775eb0..2be20c5 100644
--- a/hide_py_pckgmgmt.patch
+++ b/hide_py_pckgmgmt.patch
@@ -1,15 +1,14 @@
 --- setup.py.orig
 +++ setup.py
-@@ -10,21 +10,21 @@ import botocore
+@@ -5,22 +5,22 @@ import sys
  from setuptools import setup, find_packages
  
  
 -requires = ['jmespath==0.7.1',
--            'python-dateutil>=2.1,<3.0.0']
-+#requires = ['jmespath==0.7.1',
-+#            'python-dateutil>=2.1,<3.0.0']
- 
- 
+-            'python-dateutil>=2.1,<3.0.0',
+-            'docutils>=0.10']
+-
+-
 -if sys.version_info[:2] == (2, 6):
 -    # For python2.6 we have a few other dependencies.
 -    # First we need an ordered dictionary so we use the
@@ -21,6 +20,11 @@
 -    # JSON objects.  The 2.7 json module has this.  For 2.6
 -    # we need simplejson.
 -    requires.append('simplejson==3.3.0')
++#requires = ['jmespath==0.7.1',
++#            'python-dateutil>=2.1,<3.0.0',
++#            'docutils>=0.10']
++
++
 +#if sys.version_info[:2] == (2, 6):
 +#    # For python2.6 we have a few other dependencies.
 +#    # First we need an ordered dictionary so we use the
@@ -35,12 +39,24 @@
  
  
  setup(
-@@ -41,7 +41,7 @@ setup(
+@@ -35,13 +35,13 @@ setup(
+     package_data={'botocore': ['data/*.json', 'data/*/*.json'],
                    'botocore.vendored.requests': ['*.pem']},
-     package_dir={'botocore': 'botocore'},
      include_package_data=True,
 -    install_requires=requires,
+-    extras_require={
+-        ':python_version=="2.6"': [
+-            'ordereddict==1.1',
+-            'simplejson==3.3.0',
+-        ]
+-    },
 +#    install_requires=requires,
-     license=open("LICENSE.txt").read(),
++#    extras_require={
++#        ':python_version=="2.6"': [
++#            'ordereddict==1.1',
++#            'simplejson==3.3.0',
++#        ]
++#    },
+     license="Apache License 2.0",
      classifiers=(
-         'Development Status :: 3 - Alpha',
+         'Development Status :: 5 - Production/Stable',
diff --git a/python-botocore.changes b/python-botocore.changes
index 78a917f..cdee8de 100644
--- a/python-botocore.changes
+++ b/python-botocore.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Aug  6 13:06:44 UTC 2015 - rjschwei@suse.com
+
+- Update to version 1.1.6 (fate#318337, bsc#905354)
+  + Updating devicefarm
+  + Promote 2 functions from JSONParser to BaseJSONParser
+  + No upstream changelog for changes between 1.0.0.a3 and 1.1.5
+- Forward port hide_py_pckgmgmt.patch
+
 -------------------------------------------------------------------
 Mon Jun  1 20:24:00 UTC 2015 - rjschwei@suse.com
 
diff --git a/python-botocore.spec b/python-botocore.spec
index f735038..8de4867 100644
--- a/python-botocore.spec
+++ b/python-botocore.spec
@@ -19,7 +19,7 @@
 %define baseName botocore
 
 Name:           python-botocore
-Version:        1.0.0a3
+Version:        1.1.6
 Release:        0
 Summary:        Python interface for AWS
 License:        Apache-2.0
@@ -28,8 +28,9 @@ Url:            https://github.com/boto/botocore
 Source0:        https://pypi.python.org/packages/source/b/%{baseName}/%{baseName}-%{version}.tar.gz
 Patch0:         hide_py_pckgmgmt.patch
 Requires:       python
+Requires:       python-dateutil   <= 3.0.0
 Requires:       python-dateutil   >= 2.1
-Requires:       python-dateutil <= 3.0.0
+Requires:       python-docutils   >= 0.1
 Requires:       python-jmespath   >= 0.7.1
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 Requires:       python-ordereddict >= 1.1