From 586af13332aef2769f551c758b89ee1601d41d7e1744ec83c3e177cc71221c99 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Tue, 20 Oct 2015 14:22:30 +0000
Subject: [PATCH] Accepting request 339350 from devel:languages:python

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/339350
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-botocore?expand=0&rev=10
---
 botocore-1.1.6.tar.gz   |  3 ---
 botocore-1.2.10.tar.gz  |  3 +++
 hide_py_pckgmgmt.patch  | 46 +++++++++++++++++------------------------
 python-botocore.changes |  7 +++++++
 python-botocore.spec    |  4 ++--
 5 files changed, 31 insertions(+), 32 deletions(-)
 delete mode 100644 botocore-1.1.6.tar.gz
 create mode 100644 botocore-1.2.10.tar.gz

diff --git a/botocore-1.1.6.tar.gz b/botocore-1.1.6.tar.gz
deleted file mode 100644
index 8dc6d56..0000000
--- a/botocore-1.1.6.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a456fd7fc4c984855a147a72e044575766e0bb7171669627f16bc30617be112c
-size 1699662
diff --git a/botocore-1.2.10.tar.gz b/botocore-1.2.10.tar.gz
new file mode 100644
index 0000000..c7fedfe
--- /dev/null
+++ b/botocore-1.2.10.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8541895aa2abe2183fa15efe33794db7428fec3302e0c9bf1db13fa1668e2b66
+size 2202147
diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch
index 2be20c5..40c35db 100644
--- a/hide_py_pckgmgmt.patch
+++ b/hide_py_pckgmgmt.patch
@@ -1,40 +1,32 @@
---- setup.py.orig
-+++ setup.py
+Index: botocore-1.2.10/setup.py
+===================================================================
+--- botocore-1.2.10.orig/setup.py
++++ botocore-1.2.10/setup.py
 @@ -5,22 +5,22 @@ import sys
  from setuptools import setup, find_packages
  
  
--requires = ['jmespath==0.7.1',
+-requires = ['jmespath>=0.7.1,<1.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
--    # 2.6 backport.
--    requires.append('ordereddict==1.1')
--    # Then we need simplejson.  This is because we need
--    # a json version that allows us to specify we want to
--    # use an ordereddict instead of a normal dict for the
--    # 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',
++#requires = ['jmespath>=0.7.1,<1.0.0',
 +#            'python-dateutil>=2.1,<3.0.0',
 +#            'docutils>=0.10']
-+
-+
+ 
+ 
+-if sys.version_info[:2] == (2, 6):
 +#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
-+#    # 2.6 backport.
+     # For python2.6 we have a few other dependencies.
+     # First we need an ordered dictionary so we use the
+     # 2.6 backport.
+-    requires.append('ordereddict==1.1')
 +#    requires.append('ordereddict==1.1')
-+#    # Then we need simplejson.  This is because we need
-+#    # a json version that allows us to specify we want to
-+#    # use an ordereddict instead of a normal dict for the
-+#    # JSON objects.  The 2.7 json module has this.  For 2.6
-+#    # we need simplejson.
+     # Then we need simplejson.  This is because we need
+     # a json version that allows us to specify we want to
+     # use an ordereddict instead of a normal dict for the
+     # JSON objects.  The 2.7 json module has this.  For 2.6
+     # we need simplejson.
+-    requires.append('simplejson==3.3.0')
 +#    requires.append('simplejson==3.3.0')
  
  
diff --git a/python-botocore.changes b/python-botocore.changes
index cdee8de..84ce322 100644
--- a/python-botocore.changes
+++ b/python-botocore.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Oct 10 02:25:13 UTC 2015 - rjschwei@suse.com
+
+- Update to version 1.2.10 (bsc#949877)
+  + No upstream changelog
+- Forward port hide_py_pckgmgmt.patch
+
 -------------------------------------------------------------------
 Thu Aug  6 13:06:44 UTC 2015 - rjschwei@suse.com
 
diff --git a/python-botocore.spec b/python-botocore.spec
index 8de4867..16298cb 100644
--- a/python-botocore.spec
+++ b/python-botocore.spec
@@ -19,7 +19,7 @@
 %define baseName botocore
 
 Name:           python-botocore
-Version:        1.1.6
+Version:        1.2.10
 Release:        0
 Summary:        Python interface for AWS
 License:        Apache-2.0
@@ -53,7 +53,7 @@ A low-level interface to a growing number of Amazon Web Services.
 
 %prep
 %setup -q -n  %{baseName}-%{version}
-%patch0
+%patch0 -p1
 
 %build
 python setup.py build